projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(install-exec, install-exec): New targets. From Karl Berry.
[gnulib.git]
/
lib
/
userspec.c
diff --git
a/lib/userspec.c
b/lib/userspec.c
index
75000e8
..
c5ac309
100644
(file)
--- a/
lib/userspec.c
+++ b/
lib/userspec.c
@@
-18,28
+18,21
@@
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
\f
#ifdef HAVE_CONFIG_H
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
\f
#ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
- using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
- (which it would do because it found this file in $srcdir). */
#include <config.h>
#include <config.h>
-#else
-#include "config.h"
-#endif
#endif
#ifdef __GNUC__
#endif
#ifdef __GNUC__
-#define alloca __builtin_alloca
+#
define alloca __builtin_alloca
#else
#else
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#else
-#ifdef _AIX
+#
ifdef HAVE_ALLOCA_H
+#
include <alloca.h>
+#
else
+#
ifdef _AIX
#pragma alloca
#pragma alloca
-#else
+#
else
char *alloca ();
char *alloca ();
-#endif
-#endif
+#
endif
+#
endif
#endif
#include <stdio.h>
#endif
#include <stdio.h>
@@
-47,21
+40,21
@@
char *alloca ();
#include <pwd.h>
#include <grp.h>
#include <pwd.h>
#include <grp.h>
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
-#include <string.h>
-#ifndef index
-#define index strchr
-#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
#else
#else
-#include <strings.h>
+# include <strings.h>
+# ifndef strchr
+# define strchr index
+# endif
#endif
#ifdef STDC_HEADERS
#endif
#ifdef STDC_HEADERS
-#include <stdlib.h>
+#
include <stdlib.h>
#endif
#ifdef HAVE_UNISTD_H
#endif
#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#
include <unistd.h>
#endif
#ifndef _POSIX_VERSION
#endif
#ifndef _POSIX_VERSION
@@
-138,9
+131,9
@@
parse_user_spec (spec_arg, uid, gid, username_arg, groupname_arg)
V_STRDUP (spec, spec_arg);
/* Find the separator if there is one. */
V_STRDUP (spec, spec_arg);
/* Find the separator if there is one. */
- separator =
index
(spec, ':');
+ separator =
strchr
(spec, ':');
if (separator == NULL)
if (separator == NULL)
- separator =
index
(spec, '.');
+ separator =
strchr
(spec, '.');
/* Replace separator with a NUL. */
if (separator != NULL)
/* Replace separator with a NUL. */
if (separator != NULL)