diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2014-01-12 20:42:08 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2014-01-12 20:42:08 +0200 |
| commit | 624d70844fe63068132adb7c66ea3f8a231e56a7 (patch) | |
| tree | 79781e2b0e24b5e478804001c83fcde64602f502 /m4 | |
| parent | da83b6857bf0a67b15fc75d31a0b6802ac9baffe (diff) | |
| parent | f934f2192779db0091d1706d97d1fd43cb26dc9a (diff) | |
| download | egawk-624d70844fe63068132adb7c66ea3f8a231e56a7.tar.gz egawk-624d70844fe63068132adb7c66ea3f8a231e56a7.tar.bz2 egawk-624d70844fe63068132adb7c66ea3f8a231e56a7.zip | |
Merge branch 'master' into comment
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ChangeLog | 6 | ||||
| -rw-r--r-- | m4/readline.m4 | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index 3996eb53..9e2c279b 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,9 @@ +2013-10-16 Arnold D. Robbins <arnold@skeeve.com> + + * readline.m4: Add check for NULL return from readline() in + call to printf() for results. Thanks to Dagobert Michelsen + <dam@opencsw.org> for the report. + 2013-08-29 Arnold D. Robbins <arnold@skeeve.com> * readline.m4: Add additional code to check for history_list() diff --git a/m4/readline.m4 b/m4/readline.m4 index f24e95bf..af2745db 100644 --- a/m4/readline.m4 +++ b/m4/readline.m4 @@ -53,7 +53,8 @@ int main(int argc, char **argv) dup(fd); line = readline("giveittome> "); - printf("got <%s>\n", line); + /* some printfs don't handle NULL for %s */ + printf("got <%s>\n", line ? line : "(NULL)"); return 0; }]]), dnl action if true: |