projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(error_tail): Don't cast alloca to (void *); it's already (void *).
[gnulib.git]
/
lib
/
userspec.c
diff --git
a/lib/userspec.c
b/lib/userspec.c
index
1d3df6e
..
6e58b48
100644
(file)
--- a/
lib/userspec.c
+++ b/
lib/userspec.c
@@
-1,5
+1,5
@@
/* userspec.c -- Parse a user and group string.
/* userspec.c -- Parse a user and group string.
- Copyright (C) 1989-1992, 1997
, 1998, 2000, 2002
Free Software Foundation, Inc.
+ Copyright (C) 1989-1992, 1997
-1998, 2000, 2002-2003
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-21,19
+21,7
@@
# include <config.h>
#endif
# include <config.h>
#endif
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# if HAVE_ALLOCA_H
-# include <alloca.h>
-# else
-# ifdef _AIX
- # pragma alloca
-# else
-char *alloca ();
-# endif
-# endif
-#endif
+#include <alloca.h>
#include <stdio.h>
#include <sys/types.h>
#include <stdio.h>
#include <sys/types.h>
@@
-44,37
+32,21
@@
char *alloca ();
# include <sys/param.h>
#endif
# include <sys/param.h>
#endif
-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
-
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef strchr
-# define strchr index
-# endif
-#endif
-
-#if STDC_HEADERS
-# include <stdlib.h>
-#endif
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
+#include "posixver.h"
#include "xalloc.h"
#include "xstrtol.h"
#include "xalloc.h"
#include "xstrtol.h"
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-#else
-# define _(Text) Text
-#endif
-#define N_(Text) Text
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
#ifndef _POSIX_VERSION
struct passwd *getpwnam ();
#ifndef _POSIX_VERSION
struct passwd *getpwnam ();
@@
-90,10
+62,6
@@
struct group *getgrgid ();
# define endpwent() ((void) 0)
#endif
# define endpwent() ((void) 0)
#endif
-#ifndef CHAR_BIT
-# define CHAR_BIT 8
-#endif
-
/* The extra casts work around common compiler bugs. */
#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
/* The outer cast is needed to work around a bug in Cray C 5.0.3.0.
/* The extra casts work around common compiler bugs. */
#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
/* The outer cast is needed to work around a bug in Cray C 5.0.3.0.
@@
-201,7
+169,7
@@
parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid,
separator = strchr (spec, ':');
/* If there is no colon, then see if there's a `.'. */
separator = strchr (spec, ':');
/* If there is no colon, then see if there's a `.'. */
- if (separator == NULL)
+ if (separator == NULL
&& posix2_version () < 200112
)
{
dot = strchr (spec, '.');
/* If there's no colon but there is a `.', then first look up the
{
dot = strchr (spec, '.');
/* If there's no colon but there is a `.', then first look up the