lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Sat Mar 18 14:07:08 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>

Browse Source 
* stdio/vfscanf.c: Grok positional parameter specs (i.e. %3$d
 	means %d from 3rd arg).

	* sysdeps/mach/hurd/closedir.c: Include hurd/fd.h.

	* stdlib/strtol.c: If !GROUP, set END to null.  In loop, test only
 	END, not GROUP.
This commit is contained in:
Roland McGrath
1995-03-18 20:44:21 +00:00
parent a38f13baf0
commit be69ea41eb
4 changed files with 68 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Sat Mar 18 14:07:08 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* stdio/vfscanf.c: Grok positional parameter specs (i.e. %3$d
means %d from 3rd arg).
* sysdeps/mach/hurd/closedir.c: Include hurd/fd.h.
* stdlib/strtol.c: If !GROUP, set END to null. In loop, test only
END, not GROUP.
Fri Mar 17 12:58:37 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> Fri Mar 17 12:58:37 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* Makefile (subdirs): Put elf last. * Makefile (subdirs): Put elf last.

75
stdio/vfscanf.c
View File

@ -60,7 +60,7 @@ DEFUN(__vfscanf, (s, format, arg),
int group_flag; /* %' modifier flag. */ int group_flag; /* %' modifier flag. */
/* Type modifiers. */ /* Type modifiers. */
char is_short, is_long, is_long_double; int is_short, is_long, is_long_double;
#ifdef HAVE_LONGLONG #ifdef HAVE_LONGLONG
/* We use the `L' modifier for `long long int'. */ /* We use the `L' modifier for `long long int'. */
#define is_longlong is_long_double #define is_longlong is_long_double
@ -108,6 +108,18 @@ DEFUN(__vfscanf, (s, format, arg),
/* Run through the format string. */ /* Run through the format string. */
while (*f != '\0') while (*f != '\0')
{ {
unsigned int argpos;
/* Extract the next argument, which is of type TYPE.
For a %N$... spec, this is the Nth argument from the beginning;
otherwise it is the next argument after the state now in ARG. */
#define ARG(type) (argpos == 0 ? va_arg (arg, type) : \
({ unsigned int pos = argpos; \
va_list arg = (va_list) argptr; \
while (--pos > 0) \
(void) va_arg (arg, void *); \
va_arg (arg, type); \
}))
if (!isascii (*f)) if (!isascii (*f))
{ {
/* Non-ASCII, may be a multibyte. */ /* Non-ASCII, may be a multibyte. */
@ -145,9 +157,30 @@ DEFUN(__vfscanf, (s, format, arg),
continue; continue;
} }
/* Check for the assignment-suppressant and the number grouping flag. */ /* Initialize state of modifiers. */
argpos = 0;
do_assign = 1; do_assign = 1;
group_flag = 0; group_flag = 0;
is_short = is_long = is_long_double = malloc_string = 0;
/* Check for a positional parameter specification. */
if (isdigit (*f))
{
argpos = *f++ - '0';
while (isdigit (*f))
argpos = argpos * 10 + (*f++ - '0');
if (*f == '$')
++f;
else
{
/* Oops; that was actually the field width. */
width = argpos;
argpos = 0;
goto got_width;
}
}
/* Check for the assignment-suppressant and the number grouping flag. */
while (*f == '*' || *f == '\'') while (*f == '*' || *f == '\'')
switch (*f++) switch (*f++)
{ {
@ -166,11 +199,11 @@ DEFUN(__vfscanf, (s, format, arg),
width *= 10; width *= 10;
width += *f++ - '0'; width += *f++ - '0';
} }
got_width:
if (width == 0) if (width == 0)
width = -1; width = -1;
/* Check for type modifiers. */ /* Check for type modifiers. */
is_short = is_long = is_long_double = malloc_string = 0;
while (*f == 'h' || *f == 'l' || *f == 'L' || *f == 'a' || *f == 'q') while (*f == 'h' || *f == 'l' || *f == 'L' || *f == 'a' || *f == 'q')
switch (*f++) switch (*f++)
{ {
@ -218,13 +251,13 @@ DEFUN(__vfscanf, (s, format, arg),
case 'n': /* Answer number of assignments done. */ case 'n': /* Answer number of assignments done. */
if (do_assign) if (do_assign)
*va_arg(arg, int *) = read_in; *ARG (int *) = read_in;
break; break;
case 'c': /* Match characters. */ case 'c': /* Match characters. */
if (do_assign) if (do_assign)
{ {
str = va_arg (arg, char *); str = ARG (char *);
if (str == NULL) if (str == NULL)
conv_error (); conv_error ();
} }
@ -256,7 +289,7 @@ DEFUN(__vfscanf, (s, format, arg),
if (malloc_string) \ if (malloc_string) \
{ \ { \
/* The string is to be stored in a malloc'd buffer. */ \ /* The string is to be stored in a malloc'd buffer. */ \
strptr = va_arg (arg, char **); \ strptr = ARG (char **); \
if (strptr == NULL) \ if (strptr == NULL) \
conv_error (); \ conv_error (); \
/* Allocate an initial buffer. */ \ /* Allocate an initial buffer. */ \
@ -264,7 +297,7 @@ DEFUN(__vfscanf, (s, format, arg),
*strptr = str = malloc (strsize); \ *strptr = str = malloc (strsize); \
} \ } \
else \ else \
str = va_arg (arg, char *); \ str = ARG (char *); \
if (str == NULL) \ if (str == NULL) \
conv_error (); \ conv_error (); \
} }
@ -406,16 +439,16 @@ DEFUN(__vfscanf, (s, format, arg),
/* Convert the number. */ /* Convert the number. */
*w = '\0'; *w = '\0';
if (number_signed) if (is_longlong)
{ {
if (is_longlong) if (number_signed)
num.q = __strtoq_internal (work, &w, base, group_flag); num.q = __strtoq_internal (work, &w, base, group_flag);
else else
num.uq = __strtouq_internal (work, &w, base, group_flag); num.uq = __strtouq_internal (work, &w, base, group_flag);
} }
else else
{ {
if (is_long_double) if (number_signed)
num.l = __strtol_internal (work, &w, base, group_flag); num.l = __strtol_internal (work, &w, base, group_flag);
else else
num.ul = __strtoul_internal (work, &w, base, group_flag); num.ul = __strtoul_internal (work, &w, base, group_flag);
@ -428,25 +461,25 @@ DEFUN(__vfscanf, (s, format, arg),
if (! number_signed) if (! number_signed)
{ {
if (is_longlong) if (is_longlong)
*va_arg (arg, unsigned LONGLONG int *) = num.uq; *ARG (unsigned LONGLONG int *) = num.uq;
else if (is_long) else if (is_long)
*va_arg (arg, unsigned long int *) = num.ul; *ARG (unsigned long int *) = num.ul;
else if (is_short) else if (is_short)
*va_arg (arg, unsigned short int *) *ARG (unsigned short int *)
= (unsigned short int) num.ul; = (unsigned short int) num.ul;
else else
*va_arg (arg, unsigned int *) = (unsigned int) num.ul; *ARG (unsigned int *) = (unsigned int) num.ul;
} }
else else
{ {
if (is_longlong) if (is_longlong)
*va_arg (arg, LONGLONG int *) = num.q; *ARG (LONGLONG int *) = num.q;
else if (is_long) else if (is_long)
*va_arg (arg, long int *) = num.l; *ARG (long int *) = num.l;
else if (is_short) else if (is_short)
*va_arg (arg, short int *) = (short int) num.l; *ARG (short int *) = (short int) num.l;
else else
*va_arg (arg, int *) = (int) num.l; *ARG (int *) = (int) num.l;
} }
++done; ++done;
} }
@ -505,19 +538,19 @@ DEFUN(__vfscanf, (s, format, arg),
{ {
long double d = __strtold_internal (work, &w, group_flag); long double d = __strtold_internal (work, &w, group_flag);
if (do_assign && w != work) if (do_assign && w != work)
*va_arg (arg, long double *) = d; *ARG (long double *) = d;
} }
else if (is_long) else if (is_long)
{ {
double d = __strtod_internal (work, &w, group_flag); double d = __strtod_internal (work, &w, group_flag);
if (do_assign && w != work) if (do_assign && w != work)
*va_arg (arg, double *) = d; *ARG (double *) = d;
} }
else else
{ {
float d = __strtof_internal (work, &w, group_flag); float d = __strtof_internal (work, &w, group_flag);
if (do_assign && w != work) if (do_assign && w != work)
*va_arg (arg, float *) = d; *ARG (float *) = d;
} }
if (w == work) if (w == work)

4
stdlib/strtol.c
View File

@ -175,6 +175,8 @@ INTERNAL (strtol) (nptr, endptr, base, group)
else else
end = correctly_grouped_prefix (s, end, thousands, grouping); end = correctly_grouped_prefix (s, end, thousands, grouping);
} }
else
end = NULL;
cutoff = ULONG_MAX / (unsigned LONG int) base; cutoff = ULONG_MAX / (unsigned LONG int) base;
cutlim = ULONG_MAX % (unsigned LONG int) base; cutlim = ULONG_MAX % (unsigned LONG int) base;
@ -183,7 +185,7 @@ INTERNAL (strtol) (nptr, endptr, base, group)
i = 0; i = 0;
for (c = *s; c != '\0'; c = *++s) for (c = *s; c != '\0'; c = *++s)
{ {
if (group && s == end) if (s == end)
break; break;
if (isdigit (c)) if (isdigit (c))
c -= '0'; c -= '0';

1
sysdeps/mach/hurd/closedir.c
View File

@ -23,6 +23,7 @@ Cambridge, MA 02139, USA. */
#include <dirent.h> #include <dirent.h>
#include <unistd.h> #include <unistd.h>
#include <hurd.h> #include <hurd.h>
#include <hurd/fd.h>
/* Close the directory stream DIRP. /* Close the directory stream DIRP.
Return 0 if successful, -1 if not. */ Return 0 if successful, -1 if not. */