svn commit: r249828 - in stable/9/games/fortune: datfiles fortune unstr

[Eitan Adler]

Author: eadler
Date: Wed Apr 24 04:21:19 2013
New Revision: 249828
URL: http://svnweb.freebsd.org/changeset/base/249828

Log:
  Merge unmerged commits to fortune(1)

Modified:
  stable/9/games/fortune/datfiles/fortunes
  stable/9/games/fortune/datfiles/freebsd-tips
  stable/9/games/fortune/fortune/fortune.c
  stable/9/games/fortune/unstr/unstr.c
Directory Properties:
  stable/9/games/fortune/   (props changed)
  stable/9/games/fortune/fortune/   (props changed)

Modified: stable/9/games/fortune/datfiles/fortunes
==============================================================================
--- stable/9/games/fortune/datfiles/fortunes	Wed Apr 24 03:15:55 2013	(r249827)
+++ stable/9/games/fortune/datfiles/fortunes	Wed Apr 24 04:21:19 2013	(r249828)
@@ -901,7 +901,7 @@ to add.  This will take at least two wee
 	"Even that is too much to expect," insisted the manager, "I will be
 satisfied if you simply tell me when the program is complete."
 	The programmer agreed to this.
-	Several years slated, the manager retired.  On the way to his
+	Several years later, the manager retired.  On the way to his
 retirement lunch, he discovered the programmer asleep at his terminal.
 He had been programming all night.
 		-- Geoffrey James, "The Tao of Programming"
@@ -7947,7 +7947,7 @@ the same mistake twice without getting n
 A well-known friend is a treasure.
 %
 A well-used door needs no oil on its hinges.
-A swift-flowing steam does no grow stagnant.
+A swift-flowing stream does not grow stagnant.
 Neither sound nor thoughts can travel through a vacuum.
 Software rots if not used.
 

Modified: stable/9/games/fortune/datfiles/freebsd-tips
==============================================================================
--- stable/9/games/fortune/datfiles/freebsd-tips	Wed Apr 24 03:15:55 2013	(r249827)
+++ stable/9/games/fortune/datfiles/freebsd-tips	Wed Apr 24 04:21:19 2013	(r249828)
@@ -373,16 +373,6 @@ modes.
 %
 You can disable tcsh's terminal beep if you `set nobeep'.
 %
-You can get a good generic server install by using the
-instant-server port/package.  If you have ports installed, you can
-install it by doing
-
-	# cd /usr/ports/misc/instant-server
-	# make install && make clean
-
-as root.  This will install a collection of packages that is appropriate for
-running a "generic" server.
-%
 You can install extra packages for FreeBSD by using the ports system.
 If you have installed it, you can download, compile, and install software by
 just typing

Modified: stable/9/games/fortune/fortune/fortune.c
==============================================================================
--- stable/9/games/fortune/fortune/fortune.c	Wed Apr 24 03:15:55 2013	(r249827)
+++ stable/9/games/fortune/fortune/fortune.c	Wed Apr 24 04:21:19 2013	(r249828)
@@ -682,7 +682,7 @@ all_forts(FILEDESC *fp, char *offensive)
 	obscene->fd = fd;
 	obscene->inf = NULL;
 	obscene->path = offensive;
-	if ((sp = rindex(offensive, '/')) == NULL)
+	if ((sp = strrchr(offensive, '/')) == NULL)
 		obscene->name = offensive;
 	else
 		obscene->name = ++sp;
@@ -783,7 +783,7 @@ is_fortfile(const char *file, char **dat
 		}
 	}
 
-	if ((sp = rindex(file, '/')) == NULL)
+	if ((sp = strrchr(file, '/')) == NULL)
 		sp = file;
 	else
 		sp++;
@@ -795,7 +795,7 @@ is_fortfile(const char *file, char **dat
 		DPRINTF(2, (stderr, "FALSE (check fortunes only)\n"));
 		return (FALSE);
 	}
-	if ((sp = rindex(sp, '.')) != NULL) {
+	if ((sp = strrchr(sp, '.')) != NULL) {
 		sp++;
 		for (i = 0; suflist[i] != NULL; i++)
 			if (strcmp(sp, suflist[i]) == 0) {

Modified: stable/9/games/fortune/unstr/unstr.c
==============================================================================
--- stable/9/games/fortune/unstr/unstr.c	Wed Apr 24 03:15:55 2013	(r249827)
+++ stable/9/games/fortune/unstr/unstr.c	Wed Apr 24 04:21:19 2013	(r249828)
@@ -67,13 +67,13 @@ __FBSDID("$FreeBSD$");
 
 #include "strfile.h"
 
-char	*Infile,			/* name of input file */
-	Datafile[MAXPATHLEN],		/* name of data file */
-	Delimch;			/* delimiter character */
+static char	*Infile,		/* name of input file */
+		Datafile[MAXPATHLEN],	/* name of data file */
+		Delimch;		/* delimiter character */
 
-FILE	*Inf, *Dataf;
+static FILE	*Inf, *Dataf;
 
-void order_unstr(STRFILE *);
+static void order_unstr(STRFILE *);
 
 /* ARGSUSED */
 int
@@ -107,7 +107,7 @@ main(int argc, char *argv[])
 	exit(0);
 }
 
-void
+static void
 order_unstr(STRFILE *tbl)
 {
 	uint32_t i;