iAdd optional address for mailto option - enscript - GNU Enscript Err thinkerwim.openbsd.amsterdam 70 hgit clone git://thinkerwim.org/enscript.git URL:git://thinkerwim.org/enscript.git thinkerwim.org 70 1Log /git/enscript/log.gph thinkerwim.org 70 1Files /git/enscript/files.gph thinkerwim.org 70 1Refs /git/enscript/refs.gph thinkerwim.org 70 1README /git/enscript/file/README.gph thinkerwim.org 70 1LICENSE /git/enscript/file/COPYING.gph thinkerwim.org 70 i--- Err thinkerwim.openbsd.amsterdam 70 1commit 9cccf335aafe68d04f6b4daeeb435e5188db4acb /git/enscript/commit/9cccf335aafe68d04f6b4daeeb435e5188db4acb.gph thinkerwim.org 70 1parent 3638fc4643436b27b4fd034416d77651a057fc42 /git/enscript/commit/3638fc4643436b27b4fd034416d77651a057fc42.gph thinkerwim.org 70 hAuthor: Werner Fink URL:mailto:werner@suse.de thinkerwim.org 70 iDate: Tue, 23 Jan 2018 15:26:48 +0100 Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iAdd optional address for mailto option Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iSigned-off-by: Werner Fink Err thinkerwim.openbsd.amsterdam 70 iSigned-off-by: James Cloos Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iDiffstat: Err thinkerwim.openbsd.amsterdam 70 i M src/main.c | 15 ++++++++++++--- Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i1 file changed, 12 insertions(+), 3 deletions(-) Err thinkerwim.openbsd.amsterdam 70 i--- Err thinkerwim.openbsd.amsterdam 70 1diff --git a/src/main.c b/src/main.c /git/enscript/file/src/main.c.gph thinkerwim.org 70 i@@ -331,6 +331,7 @@ unsigned int lines_per_page = (unsigned int) -1; Err thinkerwim.openbsd.amsterdam 70 i * Send mail notification to user after print job has been completed. Err thinkerwim.openbsd.amsterdam 70 i */ Err thinkerwim.openbsd.amsterdam 70 i int mail = 0; Err thinkerwim.openbsd.amsterdam 70 i+char *mailto; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i /* Err thinkerwim.openbsd.amsterdam 70 i * -M, --media Err thinkerwim.openbsd.amsterdam 70 i@@ -850,7 +851,7 @@ static struct option long_options[] = Err thinkerwim.openbsd.amsterdam 70 i {"no-page-prefeed", no_argument, 0, 'K'}, Err thinkerwim.openbsd.amsterdam 70 i {"lineprinter", no_argument, 0, 'l'}, Err thinkerwim.openbsd.amsterdam 70 i {"lines-per-page", required_argument, 0, 'L'}, Err thinkerwim.openbsd.amsterdam 70 i- {"mail", no_argument, 0, 'm'}, Err thinkerwim.openbsd.amsterdam 70 i+ {"mail", optional_argument, 0, 'm'}, Err thinkerwim.openbsd.amsterdam 70 i {"media", required_argument, 0, 'M'}, Err thinkerwim.openbsd.amsterdam 70 i {"copies", required_argument, 0, 'n'}, Err thinkerwim.openbsd.amsterdam 70 i {"newline", required_argument, 0, 'N'}, Err thinkerwim.openbsd.amsterdam 70 i@@ -1849,7 +1850,11 @@ open_output_file () Err thinkerwim.openbsd.amsterdam 70 i /* Format spooler options. */ Err thinkerwim.openbsd.amsterdam 70 i spooler_options[0] = '\0'; Err thinkerwim.openbsd.amsterdam 70 i if (mail) Err thinkerwim.openbsd.amsterdam 70 i- strcat (spooler_options, "-m "); Err thinkerwim.openbsd.amsterdam 70 i+ { Err thinkerwim.openbsd.amsterdam 70 i+ strcat (spooler_options, "-m "); Err thinkerwim.openbsd.amsterdam 70 i+ strcat (spooler_options, mailto); Err thinkerwim.openbsd.amsterdam 70 i+ strcat (spooler_options, " "); Err thinkerwim.openbsd.amsterdam 70 i+ } Err thinkerwim.openbsd.amsterdam 70 i if (no_job_header) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i strcat (spooler_options, no_job_header_switch); Err thinkerwim.openbsd.amsterdam 70 i@@ -2012,7 +2017,7 @@ handle_options (int argc, char *argv[]) Err thinkerwim.openbsd.amsterdam 70 i int i; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i c = getopt_long (argc, argv, Err thinkerwim.openbsd.amsterdam 70 i- "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:mM:n:N:o:Op:P:qrRs:S:t:T:u::U:vVw:W:X:zZ", Err thinkerwim.openbsd.amsterdam 70 i+ "#:123456789a:A:b:BcC::d:D:e::E::f:F:gGhH::i:I:jJ:kKlL:m::M:n:N:o:Op:P:qrRs:S:t:T:u::U:vVw:W:X:zZ", Err thinkerwim.openbsd.amsterdam 70 i long_options, &option_index); Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i if (c == -1) Err thinkerwim.openbsd.amsterdam 70 i@@ -2213,6 +2218,10 @@ handle_options (int argc, char *argv[]) Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i case 'm': /* send mail upon completion */ Err thinkerwim.openbsd.amsterdam 70 i mail = 1; Err thinkerwim.openbsd.amsterdam 70 i+ if(optarg) Err thinkerwim.openbsd.amsterdam 70 i+ mailto = (optarg); Err thinkerwim.openbsd.amsterdam 70 i+ else Err thinkerwim.openbsd.amsterdam 70 i+ mailto = (*passwd).pw_name; Err thinkerwim.openbsd.amsterdam 70 i break; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i case 'M': /* select output media */ Err thinkerwim.openbsd.amsterdam 70 .