=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/printf/printf.c,v retrieving revision 1.10 retrieving revision 1.11 diff -c -r1.10 -r1.11 *** src/usr.bin/printf/printf.c 2003/06/10 22:20:49 1.10 --- src/usr.bin/printf/printf.c 2003/06/23 16:40:44 1.11 *************** *** 1,4 **** ! /* $OpenBSD: printf.c,v 1.10 2003/06/10 22:20:49 deraadt Exp $ */ /* * Copyright (c) 1989 The Regents of the University of California. --- 1,4 ---- ! /* $OpenBSD: printf.c,v 1.11 2003/06/23 16:40:44 millert Exp $ */ /* * Copyright (c) 1989 The Regents of the University of California. *************** *** 39,45 **** #ifndef lint /*static char sccsid[] = "from: @(#)printf.c 5.9 (Berkeley) 6/1/90";*/ ! static char rcsid[] = "$OpenBSD: printf.c,v 1.10 2003/06/10 22:20:49 deraadt Exp $"; #endif /* not lint */ #include --- 39,45 ---- #ifndef lint /*static char sccsid[] = "from: @(#)printf.c 5.9 (Berkeley) 6/1/90";*/ ! static char rcsid[] = "$OpenBSD: printf.c,v 1.11 2003/06/23 16:40:44 millert Exp $"; #endif /* not lint */ #include *************** *** 120,142 **** setlocale (LC_ALL, ""); #endif ! while ((ch = getopt(argc, argv, "")) != -1) { ! switch (ch) { ! case '?': ! default: ! usage(); ! return (1); ! } ! } ! argc -= optind; ! argv += optind; ! ! if (argc < 1) { usage(); return (1); } ! format = *argv; gargv = ++argv; #define SKIP1 "#-+ 0" --- 120,131 ---- setlocale (LC_ALL, ""); #endif ! if (argc < 2) { usage(); return (1); } ! format = *++argv; gargv = ++argv; #define SKIP1 "#-+ 0"