github.com/brouhaha.tumble
1
0
Fork 0
mirror of synced 2026-04-30 21:48:54 +00:00
Code Issues Releases Wiki Activity

Merge more release 0.33 changes which were apparently missing in svn import.

Browse Source
This commit is contained in:
Eric Smith
2016-06-23 20:33:44 -06:00
parent 37fad8125d
commit a355304f3d
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tumble.c
View File

@@ -353,6 +353,7 @@ void main_args (char *out_fn,
} }
#ifdef CTL_LANG
void main_control (char *control_fn) void main_control (char *control_fn)
{ {
if (! parse_control_file (control_fn)) if (! parse_control_file (control_fn))
@@ -360,11 +361,14 @@ void main_control (char *control_fn)
if (! process_controls ()) if (! process_controls ())
fatal (3, "error processing control file\n"); fatal (3, "error processing control file\n");
} }
#endif
int main (int argc, char *argv[]) int main (int argc, char *argv[])
{ {
#ifdef CTL_LANG
char *control_fn = NULL; char *control_fn = NULL;
#endif
char *out_fn = NULL; char *out_fn = NULL;
char *bookmark_fmt = NULL; char *bookmark_fmt = NULL;
int inf_count = 0; int inf_count = 0;
@@ -429,19 +433,27 @@ int main (int argc, char *argv[])
argv++; argv++;
} }
#ifdef CTL_LANG
if (! ((! out_fn) ^ (! control_fn))) if (! ((! out_fn) ^ (! control_fn)))
fatal (1, "either a control file or an output file (but not both) must be specified\n"); fatal (1, "either a control file or an output file (but not both) must be specified\n");
if (control_fn && inf_count)
fatal (1, "if control file is provided, input files can't be specified as arguments\n");
#else
if (! out_fn)
fatal (1, "an output file must be specified\n");
#endif
if (out_fn && ! inf_count) if (out_fn && ! inf_count)
fatal (1, "no input files specified\n"); fatal (1, "no input files specified\n");
if (control_fn && inf_count) #ifdef CTL_LANG
fatal (1, "if control file is provided, input files can't be specified as arguments\n");
if (control_fn) if (control_fn)
main_control (control_fn); main_control (control_fn);
else else
main_args (out_fn, inf_count, in_fn, bookmark_fmt); main_args (out_fn, inf_count, in_fn, bookmark_fmt);
#else
main_args (out_fn, inf_count, in_fn, bookmark_fmt);
#endif
close_input_file (); close_input_file ();
close_pdf_output_files (); close_pdf_output_files ();