Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12761
Modified Files: Tag: desiredata s_main.c Log Message: fixed bugs in new option parser
Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.17.2.22.2.5 retrieving revision 1.7.4.17.2.22.2.6 diff -C2 -d -r1.7.4.17.2.22.2.5 -r1.7.4.17.2.22.2.6 *** s_main.c 1 Dec 2006 17:58:58 -0000 1.7.4.17.2.22.2.5 --- s_main.c 1 Dec 2006 18:07:38 -0000 1.7.4.17.2.22.2.6 *************** *** 344,349 **** "-open <file> -- open file(s) on startup\n", "-lib <file> -- load object library(s)\n", - "-font <n> -- specify default font size in points\n", - "-typeface <name> -- specify default font (default: courier)\n", "-verbose -- extra printout on startup and when searching for files\n", "-version -- don't run Pd; just print out which version it is \n", --- 344,347 ---- *************** *** 623,637 **** if (ARG("-nomidiout",1)) {sys_nmidiout = 0; NEXT(1);} if (ARG("-nomidi",1)) {sys_nmidiin = sys_nmidiout = 0; NEXT(1);} ! if (ARG("-midiindev",1)) { sys_parsedevlist(&sys_nmidiin, sys_midiindevlist, MAXMIDIINDEV, argv[1]); if (!sys_nmidiin) goto usage; NEXT(2); } ! if (ARG("-midioutdev",1)) { sys_parsedevlist(&sys_nmidiout, sys_midioutdevlist, MAXMIDIOUTDEV, argv[1]); if (!sys_nmidiout) goto usage; NEXT(2); } ! if (ARG("-mididev",1)) { sys_parsedevlist(&sys_nmidiin, sys_midiindevlist, MAXMIDIINDEV, argv[1]); sys_parsedevlist(&sys_nmidiout, sys_midioutdevlist, MAXMIDIOUTDEV, argv[1]); --- 621,635 ---- if (ARG("-nomidiout",1)) {sys_nmidiout = 0; NEXT(1);} if (ARG("-nomidi",1)) {sys_nmidiin = sys_nmidiout = 0; NEXT(1);} ! if (ARG("-midiindev",2)) { sys_parsedevlist(&sys_nmidiin, sys_midiindevlist, MAXMIDIINDEV, argv[1]); if (!sys_nmidiin) goto usage; NEXT(2); } ! if (ARG("-midioutdev",2)) { sys_parsedevlist(&sys_nmidiout, sys_midioutdevlist, MAXMIDIOUTDEV, argv[1]); if (!sys_nmidiout) goto usage; NEXT(2); } ! if (ARG("-mididev",2)) { sys_parsedevlist(&sys_nmidiin, sys_midiindevlist, MAXMIDIINDEV, argv[1]); sys_parsedevlist(&sys_nmidiout, sys_midioutdevlist, MAXMIDIOUTDEV, argv[1]); *************** *** 639,653 **** NEXT(2); } - if (ARG("-path",2)) { - sys_searchpath = namelist_append_files(sys_searchpath, argv[1]); - NEXT(2); - } if (ARG("-nostdpath",1)) {sys_usestdpath = 0; NEXT(1);} if (ARG("-stdpath",1)) {sys_usestdpath = 1; NEXT(1);} ! if (ARG("-helppath",1)) {sys_helppath = namelist_append_files(sys_helppath, argv[1]); NEXT(2);} ! if (ARG("-open",2)) {sys_openlist = namelist_append_files(sys_openlist, argv[1]); NEXT(2);} ! if (ARG("-lib",2)) { ! fprintf(stderr,"found -lib\n"); ! sys_externlist = namelist_append_files(sys_externlist, argv[1]); NEXT(2);} if (ARG("-font",2)) { fprintf(stderr,"Warning: -font ignored by DesireData; use .ddrc instead\n"); --- 637,646 ---- NEXT(2); } if (ARG("-nostdpath",1)) {sys_usestdpath = 0; NEXT(1);} if (ARG("-stdpath",1)) {sys_usestdpath = 1; NEXT(1);} ! if (ARG("-path",2)) {sys_searchpath = namelist_append_files(sys_searchpath,argv[1]); NEXT(2);} ! if (ARG("-helppath",2)) {sys_helppath = namelist_append_files(sys_helppath, argv[1]); NEXT(2);} ! if (ARG("-open",2)) {sys_openlist = namelist_append_files(sys_openlist, argv[1]); NEXT(2);} ! if (ARG("-lib",2)) {sys_externlist = namelist_append_files(sys_externlist,argv[1]); NEXT(2);} if (ARG("-font",2)) { fprintf(stderr,"Warning: -font ignored by DesireData; use .ddrc instead\n");