AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 16:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
1999-12-24  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/posix/system.c (__libc_system): Check whether command
	processor is available if LINE is NULL.  Don't return immediately
	if wait call returned with EINTR.
	Patches by Geoff Clare <gwc@unisoft.com> (PR libc/1497 and libc/1498).
This commit is contained in:
Ulrich Drepper 1999-12-24 08:27:33 +00:00
parent 293321753c
commit ce40141c6b
3 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
1999-12-24 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/posix/system.c (__libc_system): Check whether command
processor is available if LINE is NULL. Don't return immediately
if wait call returned with EINTR.
Patches by Geoff Clare <gwc@unisoft.com> (PR libc/1497 and libc/1498).
1999-12-23 Ulrich Drepper <drepper@cygnus.com> 1999-12-23 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/ld-monetary.c (monetary_finish): Add cast to * locale/programs/ld-monetary.c (monetary_finish): Add cast to

5
locale/programs/ld-collate.c
View File

@ -1583,7 +1583,7 @@ output_weight (struct obstack *pool, struct locale_collate_t *collate,
if (elem->weights[cnt].w[i] == NULL) if (elem->weights[cnt].w[i] == NULL)
{ {
/* This entry was IGNORE. */ /* This entry was IGNORE. */
buf[len++] = '\3'; buf[len++] = IGNORE_CHAR;
} }
else else
len += utf8_encode (&buf[len], len += utf8_encode (&buf[len],
@ -1839,6 +1839,9 @@ collate_output (struct localedef_t *locale, struct charmap_t *charmap,
assert (cnt == _NL_ITEM_INDEX (_NL_NUM_LC_COLLATE)); assert (cnt == _NL_ITEM_INDEX (_NL_NUM_LC_COLLATE));
write_locale_data (output_path, "LC_COLLATE", 2 + cnt, iov); write_locale_data (output_path, "LC_COLLATE", 2 + cnt, iov);
obstack_free (&weightpool, NULL);
obstack_free (&extrapool, NULL);
} }

28
sysdeps/posix/system.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991, 92, 94, 95, 96, 97 Free Software Foundation, Inc. /* Copyright (C) 1991, 92, 94, 95, 96, 97, 99 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -44,8 +44,9 @@ __libc_system (const char *line)
#endif #endif
if (line == NULL) if (line == NULL)
/* This signals that we have a command processor available. */ /* Check that we have a command processor available. It might
return 1; not be available after a chroot(), for example. */
return __libc_system ("exit 0");
sa.sa_handler = SIG_IGN; sa.sa_handler = SIG_IGN;
sa.sa_flags = 0; sa.sa_flags = 0;
@ -113,23 +114,32 @@ __libc_system (const char *line)
status = -1; status = -1;
else else
/* Parent side. */ /* Parent side. */
#ifdef NO_WAITPID
{ {
#ifdef NO_WAITPID
pid_t child; pid_t child;
do do
{ {
child = __wait (&status); child = __wait (&status);
if (child <= -1) if (child <= -1 && errno != EINTR)
{ {
status = -1; status = -1;
break; break;
} }
} while (child != pid); /* Note that pid cannot be <= -1 and therefore the loop continues
} when __wait returned with EINTR. */
}
while (child != pid);
#else #else
if (__waitpid (pid, &status, 0) != pid) int n;
status = -1;
do
n = __waitpid (pid, &status, 0);
while (n == -1 && errno == EINTR);
if (n != pid)
status = -1;
#endif #endif
}
save = errno; save = errno;
if ((__sigaction (SIGINT, &intr, (struct sigaction *) NULL) | if ((__sigaction (SIGINT, &intr, (struct sigaction *) NULL) |