PatchSetExample
PatchSet 49
Date: 2004/11/13 22:42:39
Author: dillon
Log:
Spelling corrections.
Submitted-by: Max Okumoto <okumoto@home>
Taken-from: FreeBSD (2001/02/18 10:43:32)
Members:
job.c:1.13->1.14
parse.c:1.11->1.12
suff.c:1.10->1.11
targ.c:1.9->1.10
PSD.doc/tutorial.ms:1.2->1.3
Index: job.c
##################################################################=
RCS file: /usr/home/okumoto/Work/make/dfly-cvs/src/usr.bin/make/job.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- job.c 13 Nov 2004 00:06:16 -0000 1.13
+++ job.c 13 Nov 2004 22:42:39 -0000 1.14
@@ -1991,7 +1991,7 @@
* Need to send the output to the screen. Null terminate it
* first, overwriting the newline character if there was one.
* So long as the line isn't one we should filter (according
- * to the shell description), we print the line, preceeded
+ * to the shell description), we print the line, preceded
* by a target banner if this target isn't the same as the
* one for which we last printed something.
* The rest of the data in the buffer are then shifted down
Index: parse.c
##################################################################=
RCS file: /usr/home/okumoto/Work/make/dfly-cvs/src/usr.bin/make/parse.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- parse.c 12 Nov 2004 22:57:04 -0000 1.11
+++ parse.c 13 Nov 2004 22:42:39 -0000 1.12
@@ -2273,7 +2273,7 @@
/*
* Strip trailing blanks and tabs from the line.
- * Do not strip a blank or tab that is preceeded by
+ * Do not strip a blank or tab that is preceded by
* a '\'
*/
ep = line;
Index: suff.c
##################################################################=
RCS file: /usr/home/okumoto/Work/make/dfly-cvs/src/usr.bin/make/suff.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- suff.c 12 Nov 2004 22:57:04 -0000 1.10
+++ suff.c 13 Nov 2004 22:42:39 -0000 1.11
@@ -823,7 +823,7 @@
* The searchPath field of all the suffixes is extended by the
* directories in dirSearchPath. If paths were specified for the
* ".h" suffix, the directories are stuffed into a global variable
- * called ".INCLUDES" with each directory preceeded by a -I. The same
+ * called ".INCLUDES" with each directory preceded by a -I. The same
* is done for the ".a" suffix, except the variable is called
* ".LIBS" and the flag is -L.
*-----------------------------------------------------------------------
Index: targ.c
##################################################################=
RCS file: /usr/home/okumoto/Work/make/dfly-cvs/src/usr.bin/make/targ.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- targ.c 12 Nov 2004 22:57:04 -0000 1.9
+++ targ.c 13 Nov 2004 22:42:39 -0000 1.10
@@ -578,7 +578,7 @@
* 0.
*
* Side Effects:
- * The name of each file is printed preceeded by #\t
+ * The name of each file is printed preceded by #\t
*
*-----------------------------------------------------------------------
*/
Index: PSD.doc/tutorial.ms
##################################################################=
RCS file: /usr/home/okumoto/Work/make/dfly-cvs/src/usr.bin/make/PSD.doc/tutorial.ms,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PSD.doc/tutorial.ms 17 Jun 2003 04:29:29 -0000 1.2
+++ PSD.doc/tutorial.ms 13 Nov 2004 22:42:43 -0000 1.3
@@ -36,7 +36,7 @@
.\"
.\" @(#)tutorial.ms 8.1 (Berkeley) 8/18/93
.\" $FreeBSD: src/usr.bin/make/PSD.doc/tutorial.ms,v 1.8.2.2 2000/11/24 10:08:45 ru Exp $
-.\" $DragonFly: src/usr.bin/make/PSD.doc/tutorial.ms,v 1.1 2003/06/16 07:03:47 dillon Exp $
+.\" $DragonFly$
.\"
.so stubs
.EH 'PSD:12-%***PMake \*- A Tutorial'
@@ -603,7 +603,7 @@
bytes of output (8 Kb is the limit on many UNIX systems).
.LP
The value of a variable may be retrieved by enclosing the variable
-name in parentheses or curly braces and preceeding the whole thing
+name in parentheses or curly braces and preceding the whole thing
with a dollar sign.
.LP
For example, to set the variable CFLAGS to the string
@@ -2641,7 +2641,7 @@
unless it is preceded by a backslash.
You are allowed to use any character except
colon or exclamation point to separate the two strings. This so-called
-delimiter character may be placed in either string by preceeding it
+delimiter character may be placed in either string by preceding it
with a backslash.
.IP T
.Ix 0 def :T
---------------------
PatchSet 50
Date: 2004/11/14 20:05:25
Author: dillon
Log:
Continuing synchronization from FreeBSD.
Submitted-by: Max Okumoto <okumoto@ucsd.edu>
Members:
compat.c:1.9->1.10
dir.c:1.10->1.11
hash.c:1.7->1.8
job.c:1.14->1.15
main.c:1.14->1.15
make.h:1.9->1.10
PSD.doc/tutorial.ms:1.3->1.4
Index: compat.c
##################################################################=
RCS file: /usr/home/okumoto/Work/make/dfly-cvs/src/usr.bin/make/compat.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- compat.c 12 Nov 2004 22:57:04 -0000 1.9
+++ compat.c 14 Nov 2004 20:05:25 -0000 1.10
@@ -61,6 +61,7 @@
#include <ctype.h>
#include <errno.h>
#include <signal.h>
+#include <unistd.h>
#include "make.h"
#include "hash.h"
#include "dir.h"
@@ -324,10 +325,10 @@
if (cpid # 0) {
if (local) {
execvp(av[0], av);
- (void) write (2, av[0], strlen (av[0]));
- (void) write (2, ":", 1);
- (void) write (2, strerror(errno), strlen(strerror(errno)));
- (void) write (2, "\n", 1);
+ (void) write (STDERR_FILENO, av[0], strlen (av[0]));
+ (void) write (STDERR_FILENO, ":", 1);
+ (void) write (STDERR_FILENO, strerror(errno), strlen(strerror(errno)));
+ (void) write (STDERR_FILENO, "\n", 1);
} else {
(void)execv(av[0], av);
}
Index: dir.c
##################################################################=
RCS file: /usr/home/okumoto/Work/make/dfly-cvs/src/usr.bin/make/dir.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dir.c 13 Nov 2004 07:25:17 -0000 1.10
+++ dir.c 14 Nov 2004 20:05:25 -0000 1.11
@@ -938,7 +938,7 @@
/*
* Only do this once -- the second time folks are checking to
* see if the file was actually updated, so we need to actually go
- * to the file system.
+ * to the filesystem.
*/
DEBUGF(DIR, ("Using cached time %s for %s\n",
Targ_FmtTime((time_t)(long)Hash_GetValue(entry)), fullName));
@@ -1017,7 +1017,7 @@
* specifically instead of assuming readdir() reuturns them in
* that order when first going through a directory. This is
* needed for XFS over NFS filesystems since SGI does not
- * guarantee that these are * the first two entries returned
+ * guarantee that these are the first two entries returned
* from readdir().
*/
if (ISDOT(dp->d_name) || ISDOTDOT(dp->d_name))
Index: hash.c
##################################################################=
RCS file: /usr/home/okumoto/Work/make/dfly-cvs/src/usr.bin/make/hash.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hash.c 12 Nov 2004 22:57:04 -0000 1.7
+++ hash.c 14 Nov 2004 20:05:25 -0000 1.8
@@ -48,6 +48,7 @@
* table. Hash tables grow automatically as the amount of
* information increases.
*/
+#include <unistd.h>
#include "sprite.h"
#include "make.h"
#include "hash.h"
@@ -279,7 +280,7 @@
return;
}
}
- (void) write(2, "bad call to Hash_DeleteEntry\n", 29);
+ (void) write(STDERR_FILENO, "bad call to Hash_DeleteEntry\n", 29);
abort();
}
Index: job.c
##################################################################=
RCS file: /usr/home/okumoto/Work/make/dfly-cvs/src/usr.bin/make/job.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- job.c 13 Nov 2004 22:42:39 -0000 1.14
+++ job.c 14 Nov 2004 20:05:25 -0000 1.15
@@ -112,6 +112,7 @@
#include <stdio.h>
#include <string.h>
#include <signal.h>
+#include <unistd.h>
#include "make.h"
#include "hash.h"
#include "dir.h"
@@ -1213,7 +1214,7 @@
#endif /* REMOTE */
(void) execv(shellPath, argv);
- (void) write(2, "Could not execute shell\n",
+ (void) write(STDERR_FILENO, "Could not execute shell\n",
sizeof("Could not execute shell"));
_exit(1);
} else {
Index: main.c
##################################################################=
RCS file: /usr/home/okumoto/Work/make/dfly-cvs/src/usr.bin/make/main.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- main.c 13 Nov 2004 07:25:17 -0000 1.14
+++ main.c 14 Nov 2004 20:05:25 -0000 1.15
@@ -78,6 +78,7 @@
#else
#include <varargs.h>
#endif
+#include <unistd.h>
#include "make.h"
#include "hash.h"
#include "dir.h"
@@ -145,8 +146,6 @@
static void
MainParseArgs(int argc, char **argv)
{
- extern int optind;
- extern char *optarg;
char *p;
int c;
Index: make.h
##################################################################=
RCS file: /usr/home/okumoto/Work/make/dfly-cvs/src/usr.bin/make/make.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- make.h 13 Nov 2004 07:25:17 -0000 1.9
+++ make.h 14 Nov 2004 20:05:25 -0000 1.10
@@ -69,7 +69,7 @@
* The structure for an individual graph node. Each node has several
* pieces of data associated with it.
* 1) the name of the target it describes
- * 2) the location of the target file in the file system.
+ * 2) the location of the target file in the filesystem.
* 3) the type of operator used to define its sources (qv. parse.c)
* 4) whether it is involved in this invocation of make
* 5) whether the target has been remade
Index: PSD.doc/tutorial.ms
##################################################################=
RCS file: /usr/home/okumoto/Work/make/dfly-cvs/src/usr.bin/make/PSD.doc/tutorial.ms,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PSD.doc/tutorial.ms 13 Nov 2004 22:42:43 -0000 1.3
+++ PSD.doc/tutorial.ms 14 Nov 2004 20:05:26 -0000 1.4
@@ -1244,7 +1244,7 @@
.B \-L )
and various other information on how PMake was configured.
.Ix 0 ref configuration
-.Ix 0 ref makefile system
+.Ix 0 ref makefilesystem
.IP \fB\-i\fP
.Ix 0 def flags -i
If you give this flag, PMake will ignore non-zero status returned
@@ -2401,7 +2401,7 @@
in the normal fashion. The
.CW .h
suffix is already marked in this way in the system makefile.
-.Ix 0 ref makefile system
+.Ix 0 ref makefilesystem
E.g. if you have
.DS
\&.SUFFIXES : .bitmap
