fix ape cmd warnings Reference: /n/atom/patch/applied2013/apecmd Date: Tue May 28 04:33:57 CES 2013 Signed-off-by: quanstro@quanstro.net --- /sys/src/ape/cmd/uname.c Sat Mar 10 23:49:37 2012 +++ /sys/src/ape/cmd/uname.c Wed May 22 23:32:58 2013 @@ -2,18 +2,23 @@ #include #include -#define ARGBEGIN for((argv0=*argv),argv++,argc--;\ +#define ARGBEGIN for((argv0||(argv0=*argv)),argv++,argc--;\ argv[0] && argv[0][0]=='-' && argv[0][1];\ argc--, argv++) {\ - char *_args, *_argt, _argc;\ + char *_args, *_argt;\ + int _argc;\ _args = &argv[0][1];\ if(_args[0]=='-' && _args[1]==0){\ argc--; argv++; break;\ }\ - while(*_args) switch(_argc=*_args++) -#define ARGEND } + while(_argc = *_args++)\ + switch(_argc) +#define ARGEND SET(_argt);USED(_argt);USED(_argc);USED(_args);}USED(argv);USED(argc); #define ARGF() (_argt=_args, _args="",\ (*_argt? _argt: argv[1]? (argc--, *++argv): 0)) +#define EARGF(x) (_argt=_args, _args="",\ + (*_argt? _argt: argv[1]? (argc--, *++argv): ((x), abort(), (char*)0))) + #define ARGC() _argc char *argv0; @@ -24,7 +29,7 @@ prword(char *w) { if (started) - putchar(' '); + fputs(" ", stdout); else started = 1; fputs(w, stdout); --- /sys/src/ape/cmd/sed/mkfile Wed Mar 26 03:04:37 2003 +++ /sys/src/ape/cmd/sed/mkfile Wed May 22 23:29:00 2013 @@ -18,11 +18,11 @@ BIN=$APEBIN