aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--NOTES26
-rw-r--r--gawkmisc.c5
-rw-r--r--main.c3
-rw-r--r--pc/ChangeLog4
-rw-r--r--pc/Makefile.tst1
-rw-r--r--xalloc.h2
7 files changed, 24 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index bac7b928..1578ce2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2014-11-21 Arnold D. Robbins <arnold@skeeve.com>
+
+ * main.c: Remove a debugging // comment.
+ * NOTES: Removed.
+
+2014-11-20 Paul Eggert <eggert@cs.ucla.edu>
+
+ Port to systems where malloc (0) and/or realloc(P, 0) returns NULL.
+ * gawkmisc.c (xmalloc):
+ * xalloc.h (realloc):
+ Do not fail if malloc(0) or realloc(P, 0) returns NULL.
+ Fail only when the allocator returns null when attempting to
+ allocate a nonzero number of bytes.
+
2014-11-19 Arnold D. Robbins <arnold@skeeve.com>
Infrastructure upgrades:
diff --git a/NOTES b/NOTES
deleted file mode 100644
index f7dee5ca..00000000
--- a/NOTES
+++ /dev/null
@@ -1,26 +0,0 @@
-Page 18. OK to move the sidebar although having it at the opening
-is sort of like the opening quotes I have in other places; it's meant
-to be humorous.
-
-Page 10 - references to 'Chapter 10' and 'Chapter 11' have been left
-alone since they are links and I can't do it that way in texinfo anyway.
-
-Appendices vs. Appendixes: I have left it as the former; the latter
-looks totally wrong to me.
-
-Numbers: I use the style where values from zero to nine are spelled
-out and from 10 up they're written with digits. (I forget what the
-Chicago Manual of Style calls this.) So I've rejected those changes.
-
-C heads - I have not lowercased them; this would be incorrect
-for the Texinfo, so I've marked them as Rejected but with a reply
-in the PDF to please do this during production.
-
-Literal layout blocks not being indented - I used literal layout to get
-the brackets, which indicate optional stuff, in Roman. I think that if you
-simply fix the style sheets to indent those blocks, we should be in better
-shape.
-
-ADD STUFF ON danfuzz repo.
-
-At page 482.
diff --git a/gawkmisc.c b/gawkmisc.c
index a729d88d..fff5cc56 100644
--- a/gawkmisc.c
+++ b/gawkmisc.c
@@ -51,7 +51,8 @@ extern pointer xmalloc(size_t bytes); /* get rid of gcc warning */
pointer
xmalloc(size_t bytes)
{
- pointer p;
- emalloc(p, pointer, bytes, "xmalloc");
+ pointer p = malloc(bytes);
+ if (!p && bytes)
+ xalloc_die ();
return p;
}
diff --git a/main.c b/main.c
index 19b6c381..93f94998 100644
--- a/main.c
+++ b/main.c
@@ -480,8 +480,7 @@ main(int argc, char **argv)
if (use_lc_numeric)
setlocale(LC_NUMERIC, locale);
#endif
-// fprintf(stderr, "locale is <%s>\n", locale); fflush(stderr);
-
+
init_io();
output_fp = stdout;
diff --git a/pc/ChangeLog b/pc/ChangeLog
index 03159c1e..218621eb 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-21 Arnold D. Robbins <arnold@skeeve.com>
+
+ * Makefile.tst (id): Add an 'expect to fail for DJGPP' message.
+
2014-11-13 Scott Deifik <scottd.mail@sbcglobal.net>
* Makefile.tst: Sync with mainline.
diff --git a/pc/Makefile.tst b/pc/Makefile.tst
index 8ab15987..79d01ad9 100644
--- a/pc/Makefile.tst
+++ b/pc/Makefile.tst
@@ -2259,6 +2259,7 @@ icasers:
id:
@echo $@
+ @echo Expect id to fail with DJGPP.
@AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
diff --git a/xalloc.h b/xalloc.h
index 0d169cf9..5ee45164 100644
--- a/xalloc.h
+++ b/xalloc.h
@@ -156,7 +156,7 @@ void *
xrealloc(void *p, size_t size)
{
void *new_p = realloc(p, size);
- if (new_p == 0)
+ if (!new_p && size)
xalloc_die ();
return new_p;