summaryrefslogtreecommitdiff
path: root/source3/printing
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-05-12 11:41:14 +0200
committerGünther Deschner <gd@samba.org>2009-05-12 11:41:14 +0200
commit94665adb484c25534b756012e9b55f01737b7713 (patch)
tree3f34a7e4ead3e050c71642deb7f2ac9acd3c3cca /source3/printing
parent66dff4073d0013bfd11ac29e341765141393ea23 (diff)
downloadsamba-94665adb484c25534b756012e9b55f01737b7713.tar.gz
samba-94665adb484c25534b756012e9b55f01737b7713.tar.bz2
samba-94665adb484c25534b756012e9b55f01737b7713.zip
s3-printing: Fix vlp testprinter application.
Jeremy, we cannot just access cache_path() here without calling lp_load and friends as well as parsing configfile from the commandline in order to make "make test/selftest" find the correct conffile with path, etc. I just changed it to pass the target tdbfilename as an argument, ok ? Guenther
Diffstat (limited to 'source3/printing')
-rw-r--r--source3/printing/tests/vlp.c47
1 files changed, 23 insertions, 24 deletions
diff --git a/source3/printing/tests/vlp.c b/source3/printing/tests/vlp.c
index ec610d94e5..5fc363f2be 100644
--- a/source3/printing/tests/vlp.c
+++ b/source3/printing/tests/vlp.c
@@ -39,7 +39,7 @@ struct vlp_job {
static void usage(void)
{
- printf("Usage: print-test lpq|lprm|print|queuepause|queueresume|"
+ printf("Usage: vlp tdbfile=/tmp/vlp.tdb lpq|lprm|print|queuepause|queueresume|"
"lppause|lpresume [args]\n");
}
@@ -375,23 +375,22 @@ static int lpresume_command(int argc, char **argv)
int main(int argc, char **argv)
{
/* Parameter check */
- char *printdb_path = NULL;
+ const char *printdb_path = NULL;
- if (argc == 1) {
+ if (argc < 2) {
usage();
return 1;
}
- /* Initialise */
+ if (!strnequal(argv[1], "tdbfile", strlen("tdbfile"))) {
+ usage();
+ return 1;
+ }
-#if 0
- printdb_path = "/tmp/vlp.tdb";
-#else
- if (asprintf(&printdb_path, "%svlp.tdb",
- cache_path("printing/"))) {
+ printdb_path = get_string_param(argv[1]);
+ if (!printdb_path) {
return 1;
}
-#endif
if (!(tdb = tdb_open(printdb_path, 0, 0, O_RDWR | O_CREAT,
0666))) {
@@ -405,32 +404,32 @@ int main(int argc, char **argv)
/* Do commands */
- if (strcmp(argv[1], "lpq") == 0) {
- return lpq_command(argc - 1, &argv[1]);
+ if (strcmp(argv[2], "lpq") == 0) {
+ return lpq_command(argc - 2, &argv[2]);
}
- if (strcmp(argv[1], "lprm") == 0) {
- return lprm_command(argc - 1, &argv[1]);
+ if (strcmp(argv[2], "lprm") == 0) {
+ return lprm_command(argc - 2, &argv[2]);
}
- if (strcmp(argv[1], "print") == 0) {
- return print_command(argc - 1, &argv[1]);
+ if (strcmp(argv[2], "print") == 0) {
+ return print_command(argc - 2, &argv[2]);
}
- if (strcmp(argv[1], "queuepause") == 0) {
- return queuepause_command(argc - 1, &argv[1]);
+ if (strcmp(argv[2], "queuepause") == 0) {
+ return queuepause_command(argc - 2, &argv[2]);
}
- if (strcmp(argv[1], "queueresume") == 0) {
- return queueresume_command(argc - 1, &argv[1]);
+ if (strcmp(argv[2], "queueresume") == 0) {
+ return queueresume_command(argc - 2, &argv[2]);
}
- if (strcmp(argv[1], "lppause") == 0) {
- return lppause_command(argc - 1, &argv[1]);
+ if (strcmp(argv[2], "lppause") == 0) {
+ return lppause_command(argc - 2, &argv[2]);
}
- if (strcmp(argv[1], "lpresume") == 0) {
- return lpresume_command(argc - 1, &argv[1]);
+ if (strcmp(argv[2], "lpresume") == 0) {
+ return lpresume_command(argc - 2, &argv[2]);
}
/* Unknown command */