slp/selphy_print
1
0
Fork 0
Code Issues 51 Pull requests Activity

common: Support passing args to backend even when printing.

Browse source 
Should even work for CUPS print invocations, though it's not really a
good idea.
This commit is contained in:
Solomon Peachy 2014-02-11 22:30:57 -05:00
parent 7d4f19377b
commit 43b3e68bb2
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
backend_common.c
View file

@ -614,7 +614,8 @@ int main (int argc, char **argv)
case 'V':
extra_pid = strtol(optarg, NULL, 16);
break;
case '?': {
case '?':
default: {
/* Check to see if it is claimed by the backend */
if (backend && backend->cmdline_arg) {
int keep = optind;
@ -623,9 +624,6 @@ int main (int argc, char **argv)
}
break;
}
default:
// XXX unhandled. do something else?
break;
}
}
@ -713,11 +711,11 @@ int main (int argc, char **argv)
/* Grab the filename */
fname = argv[optind];
if (!backend_cmd) { /* ie no backend arguments */
if (!fname) {
perror("ERROR:No input file");
exit(1);
}
if (!fname && !backend_cmd) {
perror("ERROR:No input file");
exit(1);
}
if (fname) {
/* Open Input File */
if (strcmp("-", fname)) {
data_fd = open(fname, O_RDONLY);
@ -739,7 +737,7 @@ int main (int argc, char **argv)
backend_ctx = backend->init();
/* Parse printjob if necessary */
if (!backend_cmd && backend->early_parse) {
if (fname && backend->early_parse) {
printer_type = backend->early_parse(backend_ctx, data_fd);
if (printer_type < 0) {
ret = 5; /* CUPS_BACKEND_CANCEL */
@ -799,7 +797,8 @@ int main (int argc, char **argv)
if (backend_cmd) {
backend->cmdline_arg(backend_ctx, argc, argv);
goto done_claimed;
if (!fname)
goto done_claimed;
}
/* Time for the main processing loop */