commit bash-20120322 snapshot

This commit is contained in:
Chet Ramey
2012-04-09 10:01:06 -04:00
parent 8a44b411b7
commit ec860d767b
18 changed files with 16908 additions and 1764 deletions
+3 -4
View File
@@ -209,9 +209,9 @@ ansic_quote (str, flags, rlen)
int flags, *rlen;
{
char *r, *ret, *s;
int l, rsize, sindex;
int l, rsize;
unsigned char c;
size_t slen, clen;
size_t clen;
#if defined (HANDLE_MULTIBYTE)
int b;
wchar_t wc;
@@ -228,7 +228,6 @@ ansic_quote (str, flags, rlen)
*r++ = '\'';
s = str;
slen = strlen (str);
for (s = str; c = *s; s++)
{
@@ -298,7 +297,7 @@ ansic_wshouldquote (string)
wchar_t wcc;
wchar_t *wcstr = NULL;
size_t wclen, slen;
size_t slen;
slen = mbstowcs (wcstr, string, 0);
+4 -2
View File
@@ -31,6 +31,8 @@
# include <unistd.h>
#endif
#include <ansi_stdlib.h>
#include <stdio.h>
#include <errno.h>
@@ -135,7 +137,7 @@ sh_mktmpname (nameroot, flags)
filenum = (filenum << 1) ^
(unsigned long) time ((time_t *)0) ^
(unsigned long) dollar_dollar_pid ^
(unsigned long) ((flags & MT_USERANDOM) ? get_random_number () : ntmpfiles++);
(unsigned long) ((flags & MT_USERANDOM) ? random () : ntmpfiles++);
sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum);
if (tmpnamelen > 0 && tmpnamelen < 32)
filename[tdlen + 1 + tmpnamelen] = '\0';
@@ -184,7 +186,7 @@ sh_mktmpfd (nameroot, flags, namep)
filenum = (filenum << 1) ^
(unsigned long) time ((time_t *)0) ^
(unsigned long) dollar_dollar_pid ^
(unsigned long) ((flags & MT_USERANDOM) ? get_random_number () : ntmpfiles++);
(unsigned long) ((flags & MT_USERANDOM) ? random () : ntmpfiles++);
sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum);
if (tmpnamelen > 0 && tmpnamelen < 32)
filename[tdlen + 1 + tmpnamelen] = '\0';