commit bash-20050804 snapshot

builtins/printf.def

@@ -375,7 +375,7 @@ printf_builtin (list)
 		int rlen, r;
 
 		p = getstr ();
-		ch = rlen = 0;
+		ch = rlen = r = 0;
 		xp = bexpand (p, strlen (p), &ch, &rlen);
 
 		if (xp)
@@ -402,6 +402,7 @@ printf_builtin (list)
 		char *p, *xp;
 		int r;
 
+		r = 0;
 		p = getstr ();
 		if (ansic_shouldquote (p))
 		  xp = ansic_quote (p, 0, (int *)0);

builtins/ulimit.def

@@ -1,7 +1,7 @@
 This file is ulimit.def, from which is created ulimit.c.
 It implements the builtin "ulimit" in Bash.
 
-Copyright (C) 1987-2003 Free Software Foundation, Inc.
+Copyright (C) 1987-2005 Free Software Foundation, Inc.
 
 This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -24,7 +24,7 @@ $PRODUCES ulimit.c
 $BUILTIN ulimit
 $FUNCTION ulimit_builtin
 $DEPENDS_ON !_MINIX
-$SHORT_DOC ulimit [-SHacdflmnpstuv] [limit]
+$SHORT_DOC ulimit [-SHacdfilmnpqstuvx] [limit]
 Ulimit provides control over the resources available to processes
 started by the shell, on systems that allow such control.  If an
 option is given, it is interpreted as follows:
@@ -231,7 +231,7 @@ static RESOURCE_LIMITS limits[] = {
   { 'w',	RLIMIT_SWAP,	1024,	"swap size",		"kbytes" },
 #endif
 #ifdef RLIMIT_LOCKS
-  { 'w',	RLIMIT_LOCKS,	1,	"file locks",		(char *)NULL },
+  { 'x',	RLIMIT_LOCKS,	1,	"file locks",		(char *)NULL },
 #endif
   { -1, -1, -1, (char *)NULL, (char *)NULL }
 };