=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/chpass/chpass.c,v retrieving revision 1.12 retrieving revision 1.13 diff -c -r1.12 -r1.13 *** src/usr.bin/chpass/chpass.c 1998/08/02 03:35:07 1.12 --- src/usr.bin/chpass/chpass.c 1998/08/03 17:09:46 1.13 *************** *** 1,4 **** ! /* $OpenBSD: chpass.c,v 1.12 1998/08/02 03:35:07 millert Exp $ */ /* $NetBSD: chpass.c,v 1.8 1996/05/15 21:50:43 jtc Exp $ */ /*- --- 1,4 ---- ! /* $OpenBSD: chpass.c,v 1.13 1998/08/03 17:09:46 millert Exp $ */ /* $NetBSD: chpass.c,v 1.8 1996/05/15 21:50:43 jtc Exp $ */ /*- *************** *** 44,50 **** #if 0 static char sccsid[] = "@(#)chpass.c 8.4 (Berkeley) 4/2/94"; #else ! static char rcsid[] = "$OpenBSD: chpass.c,v 1.12 1998/08/02 03:35:07 millert Exp $"; #endif #endif /* not lint */ --- 44,50 ---- #if 0 static char sccsid[] = "@(#)chpass.c 8.4 (Berkeley) 4/2/94"; #else ! static char rcsid[] = "$OpenBSD: chpass.c,v 1.13 1998/08/03 17:09:46 millert Exp $"; #endif #endif /* not lint */ *************** *** 67,76 **** #include "chpass.h" #include "pathnames.h" - char *progname = "chpass"; char *tempname; uid_t uid; #ifdef YP int use_yp; int force_yp = 0; --- 67,77 ---- #include "chpass.h" #include "pathnames.h" char *tempname; uid_t uid; + extern char *__progname; + #ifdef YP int use_yp; int force_yp = 0; *************** *** 236,244 **** { #ifdef YP ! (void)fprintf(stderr, "usage: chpass [-a list] [-s shell] [-l]%s [user]\n", use_yp?" [-y]":""); #else ! (void)fprintf(stderr, "usage: chpass [-a list] [-s shell] [user]\n"); #endif exit(1); } --- 237,247 ---- { #ifdef YP ! (void)fprintf(stderr, "usage: %s [-a list] [-s shell] [-l]%s [user]\n", ! __progname, use_yp?" [-y]":""); #else ! (void)fprintf(stderr, "usage: %s [-a list] [-s shell] [user]\n", ! __progname); #endif exit(1); }