PATCH: Slightly improve printf %s

["Thorsten Dahlheimer" <tdahlheim@gmx.net>]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

This change makes it possible to print strings containing NULs with
printf '%s', by sharing the code for the %b specifier.
After I made this change, the test suite uncovered a bug (which I
introduced) in the handling of %b (and now %s) when no argument is
left, so the patch includes a fix for that, too.

Regards,
Thorsten Dahlheimer

[-- Attachment #2: printf_s.patch --]
[-- Type: application/octet-stream, Size: 1024 bytes --]

Index: Src/builtin.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/builtin.c,v
retrieving revision 1.143
diff -u -p -r1.143 builtin.c
--- Src/builtin.c	1 Aug 2005 22:20:36 -0000	1.143
+++ Src/builtin.c	8 Aug 2005 15:31:32 -0000
@@ -3752,14 +3752,18 @@ bin_print(char *name, char **args, Optio
 		print_val(intval);
 		break;
 	    case 's':
-		stringval = curarg ? curarg : &nullstr;
-		print_val(stringval);
-		break;
 	    case 'b':
 		if (curarg) {
+		    char *b;
 		    int l;
-		    char *b = getkeystring(metafy(curarg, curlen, META_USEHEAP), &l,
-					   OPT_ISSET(ops,'b') ? 2 : 0, &nnl);
+		    if (*c == 'b')
+			b = getkeystring(metafy(curarg, curlen, META_USEHEAP), &l,
+					 OPT_ISSET(ops,'b') ? 2 : 0, &nnl);
+		    else {
+			b = curarg;
+			l = curlen;
+			nnl = 0;
+		    }
 		    /* handle width/precision here and use fwrite so that
 		     * nul characters can be output */
 		    if (prec >= 0 && prec < l) l = prec;