extern/boxes
1
0
Fork 0
mirror of https://github.com/ascii-boxes/boxes.git synced 2025-02-24 21:41:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added [lcr] "shorthand" to -a option

Browse Source
This commit is contained in:
Thomas Jensen 1999-06-30 12:37:25 +00:00
parent 27c41667ef
commit 529c3f1f65
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/boxes.c
View File

@ -3,7 +3,7 @@
* Date created: March 18, 1999 (Thursday, 15:09h) * Date created: March 18, 1999 (Thursday, 15:09h)
* Author: Thomas Jensen * Author: Thomas Jensen
* tsjensen@stud.informatik.uni-erlangen.de * tsjensen@stud.informatik.uni-erlangen.de
* Version: $Id: boxes.c,v 1.22 1999/06/28 12:19:29 tsjensen Exp tsjensen $ * Version: $Id: boxes.c,v 1.23 1999/06/30 12:16:38 tsjensen Exp tsjensen $
* Language: ANSI C * Language: ANSI C
* Platforms: sunos5/sparc, for now * Platforms: sunos5/sparc, for now
* World Wide Web: http://home.pages.de/~jensen/boxes/ * World Wide Web: http://home.pages.de/~jensen/boxes/
@ -34,6 +34,12 @@
* Revision History: * Revision History:
* *
* $Log: boxes.c,v $ * $Log: boxes.c,v $
* Revision 1.23 1999/06/30 12:16:38 tsjensen
* Removed entire select_design stuff, because the parser now returns much
* smaller data structures. The first design pointed to by designs is always
* the one we need (except for ops on *all* designs).
* The first design in config file is now default design (no DEF_DESIGN anymore).
*
* Revision 1.22 1999/06/28 12:19:29 tsjensen * Revision 1.22 1999/06/28 12:19:29 tsjensen
* Moved parser init and cleanup from main() to parser.y * Moved parser init and cleanup from main() to parser.y
* Some further cleanup in main() * Some further cleanup in main()
@ -166,7 +172,7 @@ extern int optind, opterr, optopt; /* for getopt() */
static const char rcsid_boxes_c[] = static const char rcsid_boxes_c[] =
"$Id: boxes.c,v 1.22 1999/06/28 12:19:29 tsjensen Exp tsjensen $"; "$Id: boxes.c,v 1.23 1999/06/30 12:16:38 tsjensen Exp tsjensen $";
/* _\|/_ /* _\|/_
@ -266,37 +272,52 @@ static int process_commandline (int argc, char *argv[])
errfl = 0; errfl = 0;
pdummy = optarg; pdummy = optarg;
while (*pdummy) { while (*pdummy) {
if (pdummy[1] == '\0') { if (pdummy[1] == '\0' && !strchr ("lLcCrR", *pdummy)) {
errfl = 1; errfl = 1;
break; break;
} }
switch (*pdummy) { switch (*pdummy) {
case 'h': case 'h': case 'H':
case 'H':
switch (pdummy[1]) { switch (pdummy[1]) {
case 'c': case 'C': opt.halign = 'c'; break; case 'c': case 'C': opt.halign = 'c'; break;
case 'l': case 'L': opt.halign = 'l'; break; case 'l': case 'L': opt.halign = 'l'; break;
case 'r': case 'R': opt.halign = 'r'; break; case 'r': case 'R': opt.halign = 'r'; break;
default: errfl = 1; break; default: errfl = 1; break;
} }
++pdummy;
break; break;
case 'v': case 'v': case 'V':
case 'V':
switch (pdummy[1]) { switch (pdummy[1]) {
case 'c': case 'C': opt.valign = 'c'; break; case 'c': case 'C': opt.valign = 'c'; break;
case 't': case 'T': opt.valign = 't'; break; case 't': case 'T': opt.valign = 't'; break;
case 'b': case 'B': opt.valign = 'b'; break; case 'b': case 'B': opt.valign = 'b'; break;
default: errfl = 1; break; default: errfl = 1; break;
} }
++pdummy;
break; break;
case 'j': case 'j': case 'J':
case 'J':
switch (pdummy[1]) { switch (pdummy[1]) {
case 'l': case 'L': opt.justify = 'l'; break; case 'l': case 'L': opt.justify = 'l'; break;
case 'c': case 'C': opt.justify = 'c'; break; case 'c': case 'C': opt.justify = 'c'; break;
case 'r': case 'R': opt.justify = 'r'; break; case 'r': case 'R': opt.justify = 'r'; break;
default: errfl = 1; break; default: errfl = 1; break;
} }
++pdummy;
break;
case 'l': case 'L':
opt.justify = 'l';
opt.halign = 'l';
opt.valign = 'c';
break;
case 'r': case 'R':
opt.justify = 'r';
opt.halign = 'r';
opt.valign = 'c';
break;
case 'c': case 'C':
opt.justify = 'c';
opt.halign = 'c';
opt.valign = 'c';
break; break;
default: default:
errfl = 1; errfl = 1;
@ -305,7 +326,7 @@ static int process_commandline (int argc, char *argv[])
if (errfl) if (errfl)
break; break;
else else
pdummy += 2; ++pdummy;
} }
if (errfl) { if (errfl) {
fprintf (stderr, "%s: Illegal text format -- %s\n", fprintf (stderr, "%s: Illegal text format -- %s\n",