summaryrefslogtreecommitdiff
path: root/usr.bin/make
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/make')
-rw-r--r--usr.bin/make/Makefile4
-rw-r--r--usr.bin/make/compat.c8
-rw-r--r--usr.bin/make/cond.c12
-rw-r--r--usr.bin/make/engine.c20
-rw-r--r--usr.bin/make/suff.c10
-rw-r--r--usr.bin/make/targ.c4
-rw-r--r--usr.bin/make/targequiv.c36
-rw-r--r--usr.bin/make/var.c4
8 files changed, 49 insertions, 49 deletions
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index a6aaa17c604..85f2b03fdc4 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.50 2008/11/04 07:22:35 espie Exp $
+# $OpenBSD: Makefile,v 1.51 2010/04/25 13:59:53 espie Exp $
PROG= make
CFLAGS+= -I${.OBJDIR} -I${.CURDIR}
@@ -50,7 +50,7 @@ check: regress.o str.o memory.o buf.o
${CC} -o ${.TARGET} ${CFLAGS} ${.ALLSRC} ${LDADD}
regress: check
- ${.OBJDIR}/check
+ ${.OBJDIR}/check
# kludge for people who forget to make depend
var.o: varhashconsts.h
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c
index bd148ba82e6..e2cb26b4d7e 100644
--- a/usr.bin/make/compat.c
+++ b/usr.bin/make/compat.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: compat.c,v 1.72 2009/08/16 09:53:43 espie Exp $ */
+/* $OpenBSD: compat.c,v 1.73 2010/04/25 13:59:53 espie Exp $ */
/* $NetBSD: compat.c,v 1.14 1996/11/06 17:59:01 christos Exp $ */
/*
@@ -77,7 +77,7 @@ CompatMake(void *gnp, /* The node to make */
bool cmdsOk;
if (DEBUG(MAKE))
- printf("CompatMake(%s, %s)\n", pgn ? pgn->name : "NULL",
+ printf("CompatMake(%s, %s)\n", pgn ? pgn->name : "NULL",
gn->name);
/* XXX some loops are not loops, people write dependencies
@@ -159,7 +159,7 @@ CompatMake(void *gnp, /* The node to make */
do {
/* We need to be re-made. We also have to make sure
* we've got a $? variable. To be nice, we also define
- * the $> variable using Make_DoAllVar().
+ * the $> variable using Make_DoAllVar().
*/
Make_DoAllVar(sib);
cmdsOk = Job_CheckCommands(sib);
@@ -284,7 +284,7 @@ Compat_Run(Lst targs) /* List of target nodes to re-create */
}
/* For each entry in the list of targets to create, call CompatMake on
- * it to create the thing. CompatMake will leave the 'built_status'
+ * it to create the thing. CompatMake will leave the 'built_status'
* field of gn in one of several states:
* UPTODATE gn was already up-to-date
* MADE gn was recreated successfully
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index 9b572842ee6..adb89c70f12 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: cond.c,v 1.41 2009/11/11 00:12:10 fgsch Exp $ */
+/* $OpenBSD: cond.c,v 1.42 2010/04/25 13:59:53 espie Exp $ */
/* $NetBSD: cond.c,v 1.7 1996/11/06 17:59:02 christos Exp $ */
/*
@@ -224,7 +224,7 @@ CondGetArg(const char **linePtr, struct Name *arg, const char *func,
while (*cp == ' ' || *cp == '\t')
cp++;
if (parens && *cp != ')') {
- Parse_Error(PARSE_WARNING,
+ Parse_Error(PARSE_WARNING,
"Missing closing parenthesis for %s()", func);
return false;
} else if (parens)
@@ -487,7 +487,7 @@ do_string_compare:
if (*cp == '$') {
size_t len;
- if (Var_ParseBuffer(&buf, cp, NULL, doEval,
+ if (Var_ParseBuffer(&buf, cp, NULL, doEval,
&len)) {
cp += len;
continue;
@@ -625,7 +625,7 @@ CondHandleDefault(bool doEval)
condExpr += 5;
- for (arglen = 0; condExpr[arglen] != '(' &&
+ for (arglen = 0; condExpr[arglen] != '(' &&
condExpr[arglen] != '\0';)
arglen++;
@@ -1065,7 +1065,7 @@ Cond_Eval(const char *line)
if (condTop < 0) {
/* This is the one case where we can definitely proclaim a fatal
* error. If we don't, we're hosed. */
- Parse_Error(PARSE_FATAL, "Too many nested if's. %d max.",
+ Parse_Error(PARSE_FATAL, "Too many nested if's. %d max.",
MAXIF);
condTop = 0;
return COND_INVALID;
@@ -1124,7 +1124,7 @@ Cond_End(void)
condTop == 0 ? "at least ": "", MAXIF-condTop,
MAXIF-condTop == 1 ? "" : "s");
for (i = MAXIF-1; i >= condTop; i--) {
- fprintf(stderr, "\t at line %lu of %s\n",
+ fprintf(stderr, "\t at line %lu of %s\n",
condStack[i].lineno, condStack[i].filename);
}
}
diff --git a/usr.bin/make/engine.c b/usr.bin/make/engine.c
index 67b55bd30ff..3a4b5d071db 100644
--- a/usr.bin/make/engine.c
+++ b/usr.bin/make/engine.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: engine.c,v 1.27 2009/08/16 09:49:22 espie Exp $ */
+/* $OpenBSD: engine.c,v 1.28 2010/04/25 13:59:53 espie Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
* Copyright (c) 1988, 1989 by Adam de Boor
@@ -92,7 +92,7 @@ Job_CheckCommands(GNode *gn)
* No commands. Look for .DEFAULT rule from which we might infer
* commands
*/
- if ((gn->type & OP_NODEFAULT) == 0 &&
+ if ((gn->type & OP_NODEFAULT) == 0 &&
(DEFAULT->type & OP_DUMMY) == 0 &&
!Lst_IsEmpty(&DEFAULT->commands)) {
/*
@@ -111,7 +111,7 @@ Job_CheckCommands(GNode *gn)
* The node wasn't the target of an operator we have no
* .DEFAULT rule to go on and the target doesn't
* already exist. There's nothing more we can do for
- * this branch.
+ * this branch.
*/
return false;
}
@@ -312,7 +312,7 @@ Make_DoAllVar(GNode *gn)
else {
if (oodate_count == 2) {
Buf_Init(&oodate, 0);
- Buf_AddString(&oodate,
+ Buf_AddString(&oodate,
Var(OODATE_INDEX, gn));
}
Buf_AddSpace(&oodate);
@@ -325,7 +325,7 @@ Make_DoAllVar(GNode *gn)
else {
if (allsrc_count == 2) {
Buf_Init(&allsrc, 0);
- Buf_AddString(&allsrc,
+ Buf_AddString(&allsrc,
Var(ALLSRC_INDEX, gn));
}
Buf_AddSpace(&allsrc);
@@ -340,7 +340,7 @@ Make_DoAllVar(GNode *gn)
if (gn->impliedsrc)
Var(IMPSRC_INDEX, gn) = Var(TARGET_INDEX, gn->impliedsrc);
-
+
if (gn->type & OP_JOIN)
Var(TARGET_INDEX, gn) = Var(ALLSRC_INDEX, gn);
}
@@ -621,7 +621,7 @@ setup_and_run_command(char *cmd, GNode *gn, int dont_fork)
if (*cmd == '\0') {
Error("%s expands to empty string", cmd);
return 1;
- }
+ }
for (;; cmd++) {
if (*cmd == '@')
@@ -712,7 +712,7 @@ setup_and_run_command(char *cmd, GNode *gn, int dont_fork)
return 0;
}
-static void
+static void
handle_compat_interrupts(GNode *gn)
{
if (!Targ_Precious(gn)) {
@@ -782,7 +782,7 @@ run_gnode_parallel(GNode *gn)
gn->built_status = MADE;
/* XXX don't bother freeing cmd, we're dead anyways ! */
while ((cmd = Lst_DeQueue(&gn->expanded)) != NULL) {
- if (setup_and_run_command(cmd, gn,
+ if (setup_and_run_command(cmd, gn,
Lst_IsEmpty(&gn->expanded)) == 0)
break;
}
@@ -795,7 +795,7 @@ run_gnode_parallel(GNode *gn)
case ERROR:
exit(1);
default:
- fprintf(stderr, "Could not run gnode, returned %d\n",
+ fprintf(stderr, "Could not run gnode, returned %d\n",
gn->built_status);
exit(1);
}
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index c0b29ebf7e3..f14e92421c6 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: suff.c,v 1.77 2007/11/24 15:41:01 espie Exp $ */
+/* $OpenBSD: suff.c,v 1.78 2010/04/25 13:59:53 espie Exp $ */
/* $NetBSD: suff.c,v 1.13 1996/11/06 17:59:25 christos Exp $ */
/*
@@ -104,7 +104,7 @@
static struct ohash suffixes;
/* We remember the longest suffix, so we don't need to look beyond that. */
-size_t maxLen;
+size_t maxLen;
static LIST srclist;
/* Transforms (.c.o) are stored in another hash, independently from suffixes.
@@ -141,7 +141,7 @@ typedef struct Suff_ {
#define SUFF_PATH 0x10 /* False suffix: actually, the path keyword */
LIST searchPath; /* The path along which files of this suffix
* may be found */
- int order; /* order of declaration for conflict
+ int order; /* order of declaration for conflict
* resolution. */
LIST parents; /* List of Suff we have a transformation to */
LIST children; /* List of Suff we have a transformation from */
@@ -149,7 +149,7 @@ typedef struct Suff_ {
} Suff;
static struct ohash_info suff_info = {
- offsetof(struct Suff_, name), NULL,
+ offsetof(struct Suff_, name), NULL,
hash_alloc, hash_free, element_alloc
};
@@ -1288,7 +1288,7 @@ SuffApplyTransform(
if ((sGn->type & OP_OPMASK) == OP_DOUBLEDEP) {
/* When a :: node is used as the implied source of a node, we
* have to link all its cohorts in as sources as well. There's
- * only one implied src, as that will be sufficient to get
+ * only one implied src, as that will be sufficient to get
* the .IMPSRC variable set for tGn. */
for (ln=Lst_First(&sGn->cohorts); ln != NULL; ln=Lst_Adv(ln)) {
gn = (GNode *)Lst_Datum(ln);
diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c
index f7f051e0c3f..c6522b3ade5 100644
--- a/usr.bin/make/targ.c
+++ b/usr.bin/make/targ.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: targ.c,v 1.59 2009/08/16 09:49:22 espie Exp $ */
+/* $OpenBSD: targ.c,v 1.60 2010/04/25 13:59:53 espie Exp $ */
/* $NetBSD: targ.c,v 1.11 1997/02/20 16:51:50 christos Exp $ */
/*
@@ -426,7 +426,7 @@ TargPrintNode(GNode *gn, int pass)
static void
TargPrintOnlySrc(GNode *gn)
{
- if (OP_NOP(gn->type) && gn->special == SPECIAL_NONE &&
+ if (OP_NOP(gn->type) && gn->special == SPECIAL_NONE &&
!(gn->type & OP_DUMMY))
printf("#\t%s [%s]\n", gn->name,
gn->path != NULL ? gn->path : gn->name);
diff --git a/usr.bin/make/targequiv.c b/usr.bin/make/targequiv.c
index 956d12dfebb..07afc8152ae 100644
--- a/usr.bin/make/targequiv.c
+++ b/usr.bin/make/targequiv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: targequiv.c,v 1.1 2008/11/04 07:22:36 espie Exp $ */
+/* $OpenBSD: targequiv.c,v 1.2 2010/04/25 13:59:53 espie Exp $ */
/*
* Copyright (c) 2007-2008 Marc Espie.
*
@@ -53,7 +53,7 @@ struct equiv_list {
};
static struct ohash_info equiv_info = {
- offsetof(struct equiv_list, name), NULL, hash_alloc, hash_free,
+ offsetof(struct equiv_list, name), NULL, hash_alloc, hash_free,
element_alloc
};
@@ -61,9 +61,9 @@ static void attach_node(GNode *, GNode *);
static void build_equivalence(void);
static void add_to_equiv_list(struct ohash *, GNode *);
static char *names_match(GNode *, GNode *);
-static char *names_match_with_dir(const char *, const char *, char *,
+static char *names_match_with_dir(const char *, const char *, char *,
char *, const char *);
-static char *names_match_with_dirs(const char *, const char *, char *,
+static char *names_match_with_dirs(const char *, const char *, char *,
char *, const char *, const char *);
static char *relative_reduce(const char *, const char *);
static char *relative_reduce2(const char *, const char *, const char *);
@@ -76,7 +76,7 @@ static void find_siblings(GNode *);
* to insert same-basename targets in a simply linked list. Then they make
* those lists circular, to the exception of lone elements, since they can't
* alias to anything.
- *
+ *
* This structure is used to simplify alias-lookup to a great extent: two
* nodes can only alias each other if they're part of the same equivalence
* set. Most nodes either don't belong to an alias set, or to a very simple
@@ -184,7 +184,7 @@ static void
attach_node(GNode *gn, GNode *extra)
{
/* XXX normally extra->sibling == extra, but this is not
- * always the case yet, so we merge the two lists
+ * always the case yet, so we merge the two lists
*/
GNode *tmp;
@@ -240,14 +240,14 @@ absolute_reduce(const char *src)
buffer[i++] = '/';
i = parse_reduce(i, src);
- return estrdup(buffer);
+ return estrdup(buffer);
}
static char *
relative_reduce(const char *dir, const char *src)
{
size_t i = 0;
-
+
if (buffer == NULL)
buffer = emalloc(bufsize);
@@ -258,14 +258,14 @@ relative_reduce(const char *dir, const char *src)
if (buffer[i-1] != '/')
buffer[i++] = '/';
i = parse_reduce(i, src);
- return estrdup(buffer);
+ return estrdup(buffer);
}
static char *
relative_reduce2(const char *dir1, const char *dir2, const char *src)
{
size_t i = 0;
-
+
if (buffer == NULL)
buffer = emalloc(bufsize);
@@ -281,16 +281,16 @@ relative_reduce2(const char *dir1, const char *dir2, const char *src)
buffer[i++] = '/';
i = parse_reduce(i, src);
- return estrdup(buffer);
+ return estrdup(buffer);
}
static char *
-names_match_with_dir(const char *a, const char *b, char *ra,
+names_match_with_dir(const char *a, const char *b, char *ra,
char *rb, const char *dir)
{
bool r;
bool free_a, free_b;
-
+
if (ra == NULL) {
ra = relative_reduce(dir, a);
free_a = true;
@@ -317,12 +317,12 @@ names_match_with_dir(const char *a, const char *b, char *ra,
}
static char *
-names_match_with_dirs(const char *a, const char *b, char *ra,
+names_match_with_dirs(const char *a, const char *b, char *ra,
char *rb, const char *dir1, const char *dir2)
{
bool r;
bool free_a, free_b;
-
+
if (ra == NULL) {
ra = relative_reduce2(dir1, dir2, a);
free_a = true;
@@ -366,7 +366,7 @@ names_match(GNode *a, GNode *b)
} else {
r = names_match_with_dir(a->name, b->name, ra, rb, objdir);
if (!r)
- r = names_match_with_dir(a->name, b->name, ra, rb,
+ r = names_match_with_dir(a->name, b->name, ra, rb,
curdir);
if (!r) {
/* b has necessarily the same one */
@@ -376,7 +376,7 @@ names_match(GNode *a, GNode *b)
for (ln = Lst_First(l); ln != NULL; ln = Lst_Adv(ln)) {
const char *p = PathEntry_name(Lst_Datum(ln));
if (p[0] == '/') {
- r = names_match_with_dir(a->name,
+ r = names_match_with_dir(a->name,
b->name, ra, rb, p);
if (r)
break;
@@ -449,7 +449,7 @@ bool
is_sibling(GNode *gn, GNode *gn2)
{
GNode *sibling;
-
+
sibling = gn;
do {
if (sibling == gn2)
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index 15b297dc47d..ebeaf20637e 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: var.c,v 1.85 2009/05/13 10:47:54 espie Exp $ */
+/* $OpenBSD: var.c,v 1.86 2010/04/25 13:59:53 espie Exp $ */
/* $NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $ */
/*
@@ -855,7 +855,7 @@ pop_used(Var *v)
}
static char *
-get_expanded_value(const char *name, const char *ename, int idx, uint32_t k,
+get_expanded_value(const char *name, const char *ename, int idx, uint32_t k,
SymTable *ctxt, bool err, bool *freePtr)
{
char *val;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 16:29:55 +0000