From: Paul Smith <psmith@gnu.org>
Date: Thu, 12 Sep 2002 22:15:58 +0000 (+0000)
Subject: Fixups for the release.  One bug fix, some automake complaint fixes,
X-Git-Tag: 3.80~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7ebcadadbfc100af64cc4c18580a6373bd52738;p=platform%2Fupstream%2Fmake.git

Fixups for the release.  One bug fix, some automake complaint fixes,
and a function return type fix for older systems.
---

diff --git a/ChangeLog b/ChangeLog
index b539477..9637eb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-09-12  Paul D. Smith  <psmith@gnu.org>
+
+	* Makefile.am (loadavg_SOURCES, loadavg.c): Tiptoe around automake
+	so it doesn't complain about getloadavg.c.
+
+	* commands.c (set_file_variables): Make sure we always alloca() at
+	least 1 character for the value of $? (for '\0').
+
 2002-09-11  Paul D. Smith  <psmith@gnu.org>
 
 	* hash.h (STRING_COMPARE, ISTRING_COMPARE, STRING_N_COMPARE): Fix
diff --git a/Makefile.am b/Makefile.am
index 2afb6b9..e00cc6f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -121,10 +121,13 @@ check-loadavg: loadavg
 
 # The loadavg function is invoked during "make check" to test getloadavg.
 noinst_PROGRAMS = loadavg
-loadavg_SOURCES = getloadavg.c
+loadavg_SOURCES = loadavg.c
 loadavg_CFLAGS = -DTEST
 loadavg_LDADD = @GETLOADAVG_LIBS@
 
+loadavg.c: $(srcdir)/getloadavg.c
+	cp $(srcdir)/getloadavg.c loadavg.c
+
 # > check-regression
 #
 # Look for the make test suite, and run it if found and we can find perl.
diff --git a/commands.c b/commands.c
index f6baefc..84b58de 100644
--- a/commands.c
+++ b/commands.c
@@ -149,7 +149,7 @@ set_file_variables (file)
 
     cp = plus_value = (char *) alloca (plus_len);
 
-    qmark_len = plus_len;	/* Will be this or less.  */
+    qmark_len = plus_len + 1;	/* Will be this or less.  */
     for (d = file->deps; d != 0; d = d->next)
       if (! d->ignore_mtime)
         {
diff --git a/misc.c b/misc.c
index 789bb70..7f0b1b3 100644
--- a/misc.c
+++ b/misc.c
@@ -315,7 +315,7 @@ fatal (flocp, fmt, va_alist)
 
 #undef	strerror
 
-const char *
+char *
 strerror (errnum)
      int errnum;
 {