* lib/getprogname.c (getprogname) [HAVE_GETEXECNAME]:
s/program_invocation_name/base/
[HAVE_DECL___ARGV]: Handle NULL __argv or __argv[0].
+2016-09-07 Gisle Vanem <gvanem@yahoo.no>
+
+ getprogname: fix errors in previous change
+ * lib/getprogname.c (getprogname) [HAVE_GETEXECNAME]:
+ s/program_invocation_name/base/
+ [HAVE_DECL___ARGV]: Handle NULL __argv or __argv[0].
+
2016-09-08 Pádraig Brady <P@draigBrady.com>
parse-datetime: restrict debug output to input string
# elif HAVE_DECL_PROGRAM_INVOCATION_NAME
return last_component (program_invocation_name);
# elif HAVE_GETEXECNAME
- const char *base = getexecname ();
- if (!base)
- base = "?";
- return last_component (program_invocation_name);
+ const char *p = getexecname ();
+ if (!p)
+ p = "?";
+ return last_component (p);
# elif HAVE_DECL___ARGV
- return last_component (__argv);
+ const char *p = __argv && __argv[0] ? __argv[0] : "?";
+ return last_component (p);
# else
# error "getprogname module not ported to this OS"
# endif