Module Name: src
Committed By: pgoyette
Date: Sun Dec 5 04:34:23 UTC 2010
Modified Files:
src/games/boggle/boggle: bog.c
src/games/pom: pom.c
src/games/snake/snake: snake.c
src/games/tetris: tetris.c
Log Message:
Fix a few of the games to use getprogname() in their usage() functions.
Suggested by Joerg.
XXX There are probably many more that have their progname hard-coded, but
XXX I'm not up for a wholesale roto-till at the moment.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/games/boggle/boggle/bog.c
cvs rdiff -u -r1.19 -r1.20 src/games/pom/pom.c
cvs rdiff -u -r1.26 -r1.27 src/games/snake/snake/snake.c
cvs rdiff -u -r1.22 -r1.23 src/games/tetris/tetris.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/boggle/boggle/bog.c
diff -u src/games/boggle/boggle/bog.c:1.25 src/games/boggle/boggle/bog.c:1.26
--- src/games/boggle/boggle/bog.c:1.25 Sun Dec 5 04:11:51 2010
+++ src/games/boggle/boggle/bog.c Sun Dec 5 04:34:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bog.c,v 1.25 2010/12/05 04:11:51 pgoyette Exp $ */
+/* $NetBSD: bog.c,v 1.26 2010/12/05 04:34:22 pgoyette Exp $ */
/*-
* Copyright (c) 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)bog.c 8.2 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: bog.c,v 1.25 2010/12/05 04:11:51 pgoyette Exp $");
+__RCSID("$NetBSD: bog.c,v 1.26 2010/12/05 04:34:22 pgoyette Exp $");
#endif
#endif /* not lint */
@@ -707,6 +707,7 @@
usage(void)
{
(void) fprintf(stderr,
- "usage: boggle [-bd] [-s#] [-t#] [-w#] [+[+]] [boardspec]\n");
+ "usage: %s [-bd] [-s#] [-t#] [-w#] [+[+]] [boardspec]\n",
+ getprogname());
exit(1);
}
Index: src/games/pom/pom.c
diff -u src/games/pom/pom.c:1.19 src/games/pom/pom.c:1.20
--- src/games/pom/pom.c:1.19 Wed Aug 12 08:23:20 2009
+++ src/games/pom/pom.c Sun Dec 5 04:34:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pom.c,v 1.19 2009/08/12 08:23:20 dholland Exp $ */
+/* $NetBSD: pom.c,v 1.20 2010/12/05 04:34:22 pgoyette Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)pom.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: pom.c,v 1.19 2009/08/12 08:23:20 dholland Exp $");
+__RCSID("$NetBSD: pom.c,v 1.20 2010/12/05 04:34:22 pgoyette Exp $");
#endif
#endif /* not lint */
@@ -272,6 +272,7 @@
badformat(void)
{
warnx("illegal time format");
- (void)fprintf(stderr, "usage: pom [[[[[cc]yy]mm]dd]HH]\n");
+ (void)fprintf(stderr, "usage: %s [[[[[cc]yy]mm]dd]HH]\n",
+ getprogname());
exit(EXIT_FAILURE);
}
Index: src/games/snake/snake/snake.c
diff -u src/games/snake/snake/snake.c:1.26 src/games/snake/snake/snake.c:1.27
--- src/games/snake/snake/snake.c:1.26 Wed Aug 12 08:48:15 2009
+++ src/games/snake/snake/snake.c Sun Dec 5 04:34:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: snake.c,v 1.26 2009/08/12 08:48:15 dholland Exp $ */
+/* $NetBSD: snake.c,v 1.27 2010/12/05 04:34:22 pgoyette Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)snake.c 8.2 (Berkeley) 1/7/94";
#else
-__RCSID("$NetBSD: snake.c,v 1.26 2009/08/12 08:48:15 dholland Exp $");
+__RCSID("$NetBSD: snake.c,v 1.27 2010/12/05 04:34:22 pgoyette Exp $");
#endif
#endif /* not lint */
@@ -180,9 +180,13 @@
case '?':
default:
#ifdef DEBUG
- fputs("usage: snake [-d seed] [-w width] [-l length] [-t]\n", stderr);
+ fprintf(stderr,
+ "usage: %s [-d seed] [-w width] [-l length] [-t]\n",
+ getprogname());
#else
- fputs("usage: snake [-w width] [-l length] [-t]\n", stderr);
+ fprintf(stderr,
+ "usage: %s [-w width] [-l length] [-t]\n",
+ getprogname());
#endif
exit(1);
}
Index: src/games/tetris/tetris.c
diff -u src/games/tetris/tetris.c:1.22 src/games/tetris/tetris.c:1.23
--- src/games/tetris/tetris.c:1.22 Wed Aug 12 08:51:21 2009
+++ src/games/tetris/tetris.c Sun Dec 5 04:34:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: tetris.c,v 1.22 2009/08/12 08:51:21 dholland Exp $ */
+/* $NetBSD: tetris.c,v 1.23 2010/12/05 04:34:23 pgoyette Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -328,6 +328,7 @@
static void
usage(void)
{
- (void)fprintf(stderr, "usage: tetris [-ps] [-k keys] [-l level]\n");
+ (void)fprintf(stderr, "usage: %s [-ps] [-k keys] [-l level]\n",
+ getprogname());
exit(1);
}
