summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.am5
-rw-r--r--commands.c2
-rw-r--r--misc.c2
4 files changed, 14 insertions, 3 deletions
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;
{