From owner-svn-src-stable@FreeBSD.ORG Wed Apr 24 04:21:21 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1FDD96E5; Wed, 24 Apr 2013 04:21:21 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 107FC1DFA; Wed, 24 Apr 2013 04:21:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3O4LKo0051172; Wed, 24 Apr 2013 04:21:20 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3O4LJE4051165; Wed, 24 Apr 2013 04:21:19 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201304240421.r3O4LJE4051165@svn.freebsd.org> From: Eitan Adler Date: Wed, 24 Apr 2013 04:21:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r249828 - in stable/9/games/fortune: datfiles fortune unstr X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Apr 2013 04:21:21 -0000 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;