mirrors/make
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/make.git synced 2024-10-23 12:50:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Code cleanup.

Browse source
This commit is contained in:
Paul Smith 1999-08-19 04:43:46 +00:00
parent cbb9e38d10
commit 4ff6c62456
2 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
job.c
View file

@ -90,7 +90,7 @@ static int amiga_batch_file;
#endif #endif
#ifdef HAVE_WAITPID #ifdef HAVE_WAITPID
# define WAIT_NOHANG(status) waitpid (-1, (status), WNOHANG) # define WAIT_NOHANG (status) waitpid (-1, (status), WNOHANG)
#else /* Don't have waitpid. */ #else /* Don't have waitpid. */
# ifdef HAVE_WAIT3 # ifdef HAVE_WAIT3
# ifndef wait3 # ifndef wait3
@ -248,7 +248,7 @@ free_job_token (child)
/* Write any other job tokens back to the pipe. */ /* Write any other job tokens back to the pipe. */
while (write (job_fds[1], &child->job_token, 1) != 1) while (write (job_fds[1], &child->job_token, 1) != 1)
if (!EINTR_SET) if (!EINTR_SET)
pfatal_with_name(_("write jobserver")); pfatal_with_name (_("write jobserver"));
break; break;
} }
@ -678,7 +678,7 @@ reap_children (block, err)
block_sigs (); block_sigs ();
/* If this job has a token out, return it. */ /* If this job has a token out, return it. */
free_job_token(c); free_job_token (c);
/* There is now another slot open. */ /* There is now another slot open. */
if (job_slots_used > 0) if (job_slots_used > 0)
@ -733,7 +733,7 @@ free_child (child)
/* If this child has a token it hasn't relinquished, give it up now. /* If this child has a token it hasn't relinquished, give it up now.
This can happen if the job completes immediately, mainly because This can happen if the job completes immediately, mainly because
all the command lines evaluated to empty strings. */ all the command lines evaluated to empty strings. */
free_job_token(child); free_job_token (child);
free ((char *) child); free ((char *) child);
} }
@ -889,10 +889,11 @@ start_job_command (child)
#ifdef __MSDOS__ #ifdef __MSDOS__
unixy_shell /* the test is complicated and we already did it */ unixy_shell /* the test is complicated and we already did it */
#else #else
(argv[0] && !strcmp(argv[0], "/bin/sh")) (argv[0] && !strcmp (argv[0], "/bin/sh"))
#endif #endif
&& (argv[1] && !strcmp(argv[1], "-c")) && (argv[1]
&& (argv[2] && !strcmp(argv[2], ":")) && argv[1][0] == '-' && argv[1][1] == 'c' && argv[1][2] == '\0')
&& (argv[2] && argv[2][0] == ':' && argv[2][1] == '\0')
&& argv[3] == NULL) && argv[3] == NULL)
{ {
free (argv[0]); free (argv[0]);
@ -1404,7 +1405,7 @@ new_job (file)
reap_children (0, 0); reap_children (0, 0);
} }
assert(c->job_token != '-'); assert (c->job_token != '-');
if (debug_flag) if (debug_flag)
printf (_("Obtained token `%c' for child 0x%08lx (%s).\n"), printf (_("Obtained token `%c' for child 0x%08lx (%s).\n"),
c->job_token, (unsigned long int) c, c->file->name); c->job_token, (unsigned long int) c, c->file->name);
@ -2146,7 +2147,7 @@ construct_command_argv_internal (line, restp, shell, ifs, batch_filename_ptr)
/* Note these overlap and strcpy() is undefined for /* Note these overlap and strcpy() is undefined for
overlapping objects in ANSI C. The strlen() _IS_ right, overlapping objects in ANSI C. The strlen() _IS_ right,
since we need to copy the nul byte too. */ since we need to copy the nul byte too. */
bcopy (p + 1, p, strlen(p)); bcopy (p + 1, p, strlen (p));
if (instring) if (instring)
goto string_char; goto string_char;
@ -2314,7 +2315,7 @@ construct_command_argv_internal (line, restp, shell, ifs, batch_filename_ptr)
} }
*dptr = 0; *dptr = 0;
new_argv = (char **) xmalloc(2 * sizeof(char *)); new_argv = (char **) xmalloc (2 * sizeof (char *));
new_argv[0] = buffer; new_argv[0] = buffer;
new_argv[1] = 0; new_argv[1] = 0;
} }

54
main.c
View file

@ -1139,7 +1139,7 @@ int main (int argc, char ** argv)
while (!feof (stdin)) while (!feof (stdin))
{ {
char buf[2048]; char buf[2048];
unsigned int n = fread (buf, 1, sizeof(buf), stdin); unsigned int n = fread (buf, 1, sizeof (buf), stdin);
if (n > 0 && fwrite (buf, 1, n, outfile) != n) if (n > 0 && fwrite (buf, 1, n, outfile) != n)
pfatal_with_name (_("fwrite (temporary file)")); pfatal_with_name (_("fwrite (temporary file)"));
} }
@ -1156,7 +1156,7 @@ int main (int argc, char ** argv)
} }
/* Make sure the temporary file will not be remade. */ /* Make sure the temporary file will not be remade. */
stdin_nm = savestring (name, sizeof(name) -1); stdin_nm = savestring (name, sizeof (name) -1);
f = enter_file (stdin_nm); f = enter_file (stdin_nm);
f->updated = 1; f->updated = 1;
f->update_status = 0; f->update_status = 0;
@ -1193,9 +1193,9 @@ int main (int argc, char ** argv)
/* This is supposed to be the default, but what the heck... */ /* This is supposed to be the default, but what the heck... */
sa.sa_flags = SA_INTERRUPT; sa.sa_flags = SA_INTERRUPT;
# endif # endif
# define HANDLESIG(s) sigaction(s, &sa, NULL) # define HANDLESIG(s) sigaction (s, &sa, NULL)
# else # else
# define HANDLESIG(s) signal(s, child_handler) # define HANDLESIG(s) signal (s, child_handler)
# endif # endif
/* OK, now actually install the handlers. */ /* OK, now actually install the handlers. */
@ -1329,7 +1329,7 @@ int main (int argc, char ** argv)
if (job_slots > 1) if (job_slots > 1)
{ {
char buf[(sizeof("1024")*2)+1]; char buf[(sizeof ("1024")*2)+1];
char c = '0'; char c = '0';
if (pipe (job_fds) < 0 || (job_rfd = dup (job_fds[0])) < 0) if (pipe (job_fds) < 0 || (job_rfd = dup (job_fds[0])) < 0)
@ -1341,7 +1341,7 @@ int main (int argc, char ** argv)
while (--job_slots) while (--job_slots)
{ {
write(job_fds[1], &c, 1); write (job_fds[1], &c, 1);
if (c == '9') if (c == '9')
c = 'a'; c = 'a';
else if (c == 'z') else if (c == 'z')
@ -1352,8 +1352,8 @@ int main (int argc, char ** argv)
++c; ++c;
} }
sprintf(buf, "%d,%d", job_fds[0], job_fds[1]); sprintf (buf, "%d,%d", job_fds[0], job_fds[1]);
job_slots_str = xstrdup(buf); job_slots_str = xstrdup (buf);
} }
#endif #endif
@ -1590,9 +1590,9 @@ int main (int argc, char ** argv)
/* Add -o option for the stdin temporary file, if necessary. */ /* Add -o option for the stdin temporary file, if necessary. */
if (stdin_nm) if (stdin_nm)
{ {
nargv = (char **)xmalloc((nargc + 2) * sizeof(char *)); nargv = (char **) xmalloc ((nargc + 2) * sizeof (char *));
bcopy((char *)argv, (char *)nargv, argc * sizeof(char *)); bcopy ((char *) argv, (char *) nargv, argc * sizeof (char *));
nargv[nargc++] = concat("-o", stdin_nm, ""); nargv[nargc++] = concat ("-o", stdin_nm, "");
nargv[nargc] = 0; nargv[nargc] = 0;
} }
@ -1670,8 +1670,8 @@ int main (int argc, char ** argv)
/* If there is a temp file from reading a makefile from stdin, get rid of /* If there is a temp file from reading a makefile from stdin, get rid of
it now. */ it now. */
if (stdin_nm && unlink(stdin_nm) < 0 && errno != ENOENT) if (stdin_nm && unlink (stdin_nm) < 0 && errno != ENOENT)
perror_with_name(_("unlink (temporary file): "), stdin_nm); perror_with_name (_("unlink (temporary file): "), stdin_nm);
{ {
int status; int status;
@ -1849,7 +1849,7 @@ handle_non_switch_argument (arg, env)
struct variable *v; struct variable *v;
char *value; char *value;
v = lookup_variable("MAKECMDGOALS", 12); v = lookup_variable ("MAKECMDGOALS", 12);
if (v == 0) if (v == 0)
value = f->name; value = f->name;
else else
@ -1857,14 +1857,14 @@ handle_non_switch_argument (arg, env)
/* Paste the old and new values together */ /* Paste the old and new values together */
unsigned int oldlen, newlen; unsigned int oldlen, newlen;
oldlen = strlen(v->value); oldlen = strlen (v->value);
newlen = strlen(f->name); newlen = strlen (f->name);
value = (char *)alloca(oldlen + 1 + newlen + 1); value = (char *) alloca (oldlen + 1 + newlen + 1);
bcopy(v->value, value, oldlen); bcopy (v->value, value, oldlen);
value[oldlen] = ' '; value[oldlen] = ' ';
bcopy(f->name, &value[oldlen + 1], newlen + 1); bcopy (f->name, &value[oldlen + 1], newlen + 1);
} }
define_variable("MAKECMDGOALS", 12, value, o_default, 0); define_variable ("MAKECMDGOALS", 12, value, o_default, 0);
} }
} }
} }
@ -2041,7 +2041,7 @@ decode_switches (argc, argv, env)
if (optarg == 0) if (optarg == 0)
optarg = cs->noarg_value; optarg = cs->noarg_value;
*(char **)cs->value_ptr = optarg; *(char **) cs->value_ptr = optarg;
break; break;
case string: case string:
@ -2129,7 +2129,7 @@ positive integral argument"),
if (!env && (bad || print_usage_flag)) if (!env && (bad || print_usage_flag))
{ {
print_usage(bad); print_usage (bad);
die (bad ? 2 : 0); die (bad ? 2 : 0);
} }
} }
@ -2345,16 +2345,16 @@ define_makeflags (all, makefile)
case int_string: case int_string:
if (all) if (all)
{ {
char *vp = *(char **)cs->value_ptr; char *vp = *(char **) cs->value_ptr;
if (cs->default_value != 0 if (cs->default_value != 0
&& streq(vp, cs->default_value)) && streq (vp, cs->default_value))
break; break;
if (cs->noarg_value != 0 if (cs->noarg_value != 0
&& streq(vp, cs->noarg_value)) && streq (vp, cs->noarg_value))
ADD_FLAG("", 0); /* Optional value omitted; see below. */ ADD_FLAG ("", 0); /* Optional value omitted; see below. */
else else
ADD_FLAG(vp, strlen(vp)); ADD_FLAG (vp, strlen (vp));
} }
break; break;