bash-3.0 cleanup of extra files

1 files changed, 0 insertions, 958 deletions

diff --git a/general.c~ b/general.c~
deleted file mode 100644
index 74c00f74..00000000
--- a/general.c~
+++ /dev/null
@@ -1,958 +0,0 @@
-/* general.c -- Stuff that is used by all files. */
-
-/* Copyright (C) 1987-2004 Free Software Foundation, Inc.
-
-   This file is part of GNU Bash, the Bourne Again SHell.
-
-   Bash is free software; you can redistribute it and/or modify it under
-   the terms of the GNU General Public License as published by the Free
-   Software Foundation; either version 2, or (at your option) any later
-   version.
-
-   Bash is distributed in the hope that it will be useful, but WITHOUT ANY
-   WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with Bash; see the file COPYING.  If not, write to the Free Software
-   Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
-
-#include "config.h"
-
-#include "bashtypes.h"
-#ifndef _MINIX
-#  include <sys/param.h>
-#endif
-#include "posixstat.h"
-
-#if defined (HAVE_UNISTD_H)
-#  include <unistd.h>
-#endif
-
-#include "filecntl.h"
-#include "bashansi.h"
-#include <stdio.h>
-#include "chartypes.h"
-#include <errno.h>
-
-#include "bashintl.h"
-
-#include "shell.h"
-#include <tilde/tilde.h>
-
-#if !defined (errno)
-extern int errno;
-#endif /* !errno */
-
-extern int expand_aliases;
-extern int interrupt_immediately;
-extern int interactive_comments;
-extern int check_hashed_filenames;
-extern int source_uses_path;
-extern int source_searches_cwd;
-
-static char *bash_special_tilde_expansions __P((char *));
-static int unquoted_tilde_word __P((const char *));
-static void initialize_group_array __P((void));
-
-/* A standard error message to use when getcwd() returns NULL. */
-char *bash_getcwd_errstr = N_("getcwd: cannot access parent directories");
-
-/* Do whatever is necessary to initialize `Posix mode'. */
-void
-posix_initialize (on)
-     int on;
-{
-  /* Things that should be turned on when posix mode is enabled. */
-  if (on != 0)
-    {
-      interactive_comments = source_uses_path = expand_aliases = 1;
-    }
-
-  /* Things that should be turned on when posix mode is disabled. */
-  if (on == 0)
-    {
-      source_searches_cwd = 1;
-      expand_aliases = interactive_shell;
-    }
-}
-
-/* **************************************************************** */
-/*								    */
-/*  Functions to convert to and from and display non-standard types */
-/*								    */
-/* **************************************************************** */
-
-#if defined (RLIMTYPE)
-RLIMTYPE
-string_to_rlimtype (s)
-     char *s;
-{
-  RLIMTYPE ret;
-  int neg;
-
-  ret = 0;
-  neg = 0;
-  while (s && *s && whitespace (*s))
-    s++;
-  if (*s == '-' || *s == '+')
-    {
-      neg = *s == '-';
-      s++;
-    }
-  for ( ; s && *s && DIGIT (*s); s++)
-    ret = (ret * 10) + TODIGIT (*s);
-  return (neg ? -ret : ret);
-}
-
-void
-print_rlimtype (n, addnl)
-     RLIMTYPE n;
-     int addnl;
-{
-  char s[INT_STRLEN_BOUND (RLIMTYPE) + 1], *p;
-
-  p = s + sizeof(s);
-  *--p = '\0';
-
-  if (n < 0)
-    {
-      do
-	*--p = '0' - n % 10;
-      while ((n /= 10) != 0);
-
-      *--p = '-';
-    }
-  else
-    {
-      do
-	*--p = '0' + n % 10;
-      while ((n /= 10) != 0);
-    }
-
-  printf ("%s%s", p, addnl ? "\n" : "");
-}
-#endif /* RLIMTYPE */
-
-/* **************************************************************** */
-/*								    */
-/*		       Input Validation Functions		    */
-/*								    */
-/* **************************************************************** */
-
-/* Return non-zero if all of the characters in STRING are digits. */
-int
-all_digits (string)
-     char *string;
-{
-  register char *s;
-
-  for (s = string; *s; s++)
-    if (DIGIT (*s) == 0)
-      return (0);
-
-  return (1);
-}
-
-/* Return non-zero if the characters pointed to by STRING constitute a
-   valid number.  Stuff the converted number into RESULT if RESULT is
-   not null. */
-int
-legal_number (string, result)
-     char *string;
-     intmax_t *result;
-{
-  intmax_t value;
-  char *ep;
-
-  if (result)
-    *result = 0;
-
-  errno = 0;
-  value = strtoimax (string, &ep, 10);
-  if (errno)
-    return 0;	/* errno is set on overflow or underflow */
-
-  /* Skip any trailing whitespace, since strtoimax does not. */
-  while (whitespace (*ep))
-    ep++;
-
-  /* If *string is not '\0' but *ep is '\0' on return, the entire string
-     is valid. */
-  if (string && *string && *ep == '\0')
-    {
-      if (result)
-	*result = value;
-      /* The SunOS4 implementation of strtol() will happily ignore
-	 overflow conditions, so this cannot do overflow correctly
-	 on those systems. */
-      return 1;
-    }
-    
-  return (0);
-}
-
-/* Return 1 if this token is a legal shell `identifier'; that is, it consists
-   solely of letters, digits, and underscores, and does not begin with a
-   digit. */
-int
-legal_identifier (name)
-     char *name;
-{
-  register char *s;
-  unsigned char c;
-
-  if (!name || !(c = *name) || (legal_variable_starter (c) == 0))
-    return (0);
-
-  for (s = name + 1; (c = *s) != 0; s++)
-    {
-      if (legal_variable_char (c) == 0)
-	return (0);
-    }
-  return (1);
-}
-
-/* Make sure that WORD is a valid shell identifier, i.e.
-   does not contain a dollar sign, nor is quoted in any way.  Nor
-   does it consist of all digits.  If CHECK_WORD is non-zero,
-   the word is checked to ensure that it consists of only letters,
-   digits, and underscores. */
-int
-check_identifier (word, check_word)
-     WORD_DESC *word;
-     int check_word;
-{
-  if ((word->flags & (W_HASDOLLAR|W_QUOTED)) || all_digits (word->word))
-    {
-      internal_error (_("`%s': not a valid identifier"), word->word);
-      return (0);
-    }
-  else if (check_word && legal_identifier (word->word) == 0)
-    {
-      internal_error (_("`%s': not a valid identifier"), word->word);
-      return (0);
-    }
-  else
-    return (1);
-}
-
-/* Return 1 if STRING comprises a valid alias name.  The shell accepts
-   essentially all characters except those which must be quoted to the
-   parser (which disqualifies them from alias expansion anyway) and `/'. */
-int
-legal_alias_name (string, flags)
-     char *string;
-     int flags;
-{
-  register char *s;
-
-  for (s = string; *s; s++)
-    if (shellbreak (*s) || shellquote (*s) || shellexp (*s) || (*s == '/'))
-      return 0;
-  return 1;
-}
-
-/* Returns non-zero if STRING is an assignment statement.  The returned value
-   is the index of the `=' sign. */
-int
-assignment (string, flags)
-     const char *string;
-     int flags;
-{
-  register unsigned char c;
-  register int newi, indx;
-
-  c = string[indx = 0];
-
-#if defined (ARRAY_VARS)
-  if ((legal_variable_starter (c) == 0) && (flags && c != '[')) /* ] */
-#else
-  if (legal_variable_starter (c) == 0)
-#endif
-    return (0);
-
-  while (c = string[indx])
-    {
-      /* The following is safe.  Note that '=' at the start of a word
-	 is not an assignment statement. */
-      if (c == '=')
-	return (indx);
-
-#if defined (ARRAY_VARS)
-      if (c == '[')
-	{
-	  newi = skipsubscript (string, indx);
-	  if (string[newi++] != ']')
-	    return (0);
-	  return ((string[newi] == '=') ? newi : 0);
-	}
-#endif /* ARRAY_VARS */
-
-      /* Variable names in assignment statements may contain only letters,
-	 digits, and `_'. */
-      if (legal_variable_char (c) == 0)
-	return (0);
-
-      indx++;
-    }
-  return (0);
-}
-
-/* **************************************************************** */
-/*								    */
-/*	     Functions to manage files and file descriptors	    */
-/*								    */
-/* **************************************************************** */
-
-/* A function to unset no-delay mode on a file descriptor.  Used in shell.c
-   to unset it on the fd passed as stdin.  Should be called on stdin if
-   readline gets an EAGAIN or EWOULDBLOCK when trying to read input. */
-
-#if !defined (O_NDELAY)
-#  if defined (FNDELAY)
-#    define O_NDELAY FNDELAY
-#  endif
-#endif /* O_NDELAY */
-
-/* Make sure no-delay mode is not set on file descriptor FD. */
-int
-sh_unset_nodelay_mode (fd)
-     int fd;
-{
-  int flags, bflags;
-
-  if ((flags = fcntl (fd, F_GETFL, 0)) < 0)
-    return -1;
-
-  bflags = 0;
-
-  /* This is defined to O_NDELAY in filecntl.h if O_NONBLOCK is not present
-     and O_NDELAY is defined. */
-#ifdef O_NONBLOCK
-  bflags |= O_NONBLOCK;
-#endif
-
-#ifdef O_NDELAY
-  bflags |= O_NDELAY;
-#endif
-
-  if (flags & bflags)
-    {
-      flags &= ~bflags;
-      return (fcntl (fd, F_SETFL, flags));
-    }
-
-  return 0;
-}
-
-/* Return 1 if file descriptor FD is valid; 0 otherwise. */
-int
-sh_validfd (fd)
-     int fd;
-{
-  return (fcntl (fd, F_GETFD, 0) >= 0);
-}
-
-/* There is a bug in the NeXT 2.1 rlogind that causes opens
-   of /dev/tty to fail. */
-
-#if defined (__BEOS__)
-/* On BeOS, opening in non-blocking mode exposes a bug in BeOS, so turn it
-   into a no-op.  This should probably go away in the future. */
-#  undef O_NONBLOCK
-#  define O_NONBLOCK 0
-#endif /* __BEOS__ */
-
-void
-check_dev_tty ()
-{
-  int tty_fd;
-  char *tty;
-
-  tty_fd = open ("/dev/tty", O_RDWR|O_NONBLOCK);
-
-  if (tty_fd < 0)
-    {
-      tty = (char *)ttyname (fileno (stdin));
-      if (tty == 0)
-	return;
-      tty_fd = open (tty, O_RDWR|O_NONBLOCK);
-    }
-  close (tty_fd);
-}
-
-/* Return 1 if PATH1 and PATH2 are the same file.  This is kind of
-   expensive.  If non-NULL STP1 and STP2 point to stat structures
-   corresponding to PATH1 and PATH2, respectively. */
-int
-same_file (path1, path2, stp1, stp2)
-     char *path1, *path2;
-     struct stat *stp1, *stp2;
-{
-  struct stat st1, st2;
-
-  if (stp1 == NULL)
-    {
-      if (stat (path1, &st1) != 0)
-	return (0);
-      stp1 = &st1;
-    }
-
-  if (stp2 == NULL)
-    {
-      if (stat (path2, &st2) != 0)
-	return (0);
-      stp2 = &st2;
-    }
-
-  return ((stp1->st_dev == stp2->st_dev) && (stp1->st_ino == stp2->st_ino));
-}
-
-/* Move FD to a number close to the maximum number of file descriptors
-   allowed in the shell process, to avoid the user stepping on it with
-   redirection and causing us extra work.  If CHECK_NEW is non-zero,
-   we check whether or not the file descriptors are in use before
-   duplicating FD onto them.  MAXFD says where to start checking the
-   file descriptors.  If it's less than 20, we get the maximum value
-   available from getdtablesize(2). */
-int
-move_to_high_fd (fd, check_new, maxfd)
-     int fd, check_new, maxfd;
-{
-  int script_fd, nfds, ignore;
-
-  if (maxfd < 20)
-    {
-      nfds = getdtablesize ();
-      if (nfds <= 0)
-	nfds = 20;
-      if (nfds > HIGH_FD_MAX)
-	nfds = HIGH_FD_MAX;		/* reasonable maximum */
-    }
-  else
-    nfds = maxfd;
-
-  for (nfds--; check_new && nfds > 3; nfds--)
-    if (fcntl (nfds, F_GETFD, &ignore) == -1)
-      break;
-
-  if (nfds > 3 && fd != nfds && (script_fd = dup2 (fd, nfds)) != -1)
-    {
-      if (check_new == 0 || fd != fileno (stderr))	/* don't close stderr */
-	close (fd);
-      return (script_fd);
-    }
-
-  /* OK, we didn't find one less than our artificial maximum; return the
-     original file descriptor. */
-  return (fd);
-}
- 
-/* Return non-zero if the characters from SAMPLE are not all valid
-   characters to be found in the first line of a shell script.  We
-   check up to the first newline, or SAMPLE_LEN, whichever comes first.
-   All of the characters must be printable or whitespace. */
-
-int
-check_binary_file (sample, sample_len)
-     char *sample;
-     int sample_len;
-{
-  register int i;
-  unsigned char c;
-
-  for (i = 0; i < sample_len; i++)
-    {
-      c = sample[i];
-      if (c == '\n')
-	return (0);
-
-      if (ISSPACE (c) == 0 && ISPRINT (c) == 0)
-	return (1);
-    }
-
-  return (0);
-}
-
-/* **************************************************************** */
-/*								    */
-/*		    Functions to inspect pathnames		    */
-/*								    */
-/* **************************************************************** */
-
-int
-file_isdir (fn)
-     char *fn;
-{
-  struct stat sb;
-
-  return ((stat (fn, &sb) == 0) && S_ISDIR (sb.st_mode));
-}
-
-int
-file_iswdir (fn)
-     char *fn;
-{
-  return (file_isdir (fn) && test_eaccess (fn, W_OK) == 0);
-}
-
-
-/* **************************************************************** */
-/*								    */
-/*		    Functions to manipulate pathnames		    */
-/*								    */
-/* **************************************************************** */
-
-/* Turn STRING (a pathname) into an absolute pathname, assuming that
-   DOT_PATH contains the symbolic location of `.'.  This always
-   returns a new string, even if STRING was an absolute pathname to
-   begin with. */
-char *
-make_absolute (string, dot_path)
-     char *string, *dot_path;
-{
-  char *result;
-
-  if (dot_path == 0 || ABSPATH(string))
-#ifdef __CYGWIN__
-    {
-      char pathbuf[PATH_MAX + 1];
-
-      cygwin_conv_to_full_posix_path (string, pathbuf);
-      result = savestring (pathbuf);
-    }
-#else
-    result = savestring (string);
-#endif
-  else
-    result = sh_makepath (dot_path, string, 0);
-
-  return (result);
-}
-
-/* Return 1 if STRING contains an absolute pathname, else 0.  Used by `cd'
-   to decide whether or not to look up a directory name in $CDPATH. */
-int
-absolute_pathname (string)
-     const char *string;
-{
-  if (string == 0 || *string == '\0')
-    return (0);
-
-  if (ABSPATH(string))
-    return (1);
-
-  if (string[0] == '.' && PATHSEP(string[1]))	/* . and ./ */
-    return (1);
-
-  if (string[0] == '.' && string[1] == '.' && PATHSEP(string[2]))	/* .. and ../ */
-    return (1);
-
-  return (0);
-}
-
-/* Return 1 if STRING is an absolute program name; it is absolute if it
-   contains any slashes.  This is used to decide whether or not to look
-   up through $PATH. */
-int
-absolute_program (string)
-     const char *string;
-{
-  return ((char *)xstrchr (string, '/') != (char *)NULL);
-}
-
-/* Return the `basename' of the pathname in STRING (the stuff after the
-   last '/').  If STRING is not a full pathname, simply return it. */
-char *
-base_pathname (string)
-     char *string;
-{
-  char *p;
-
-  if (absolute_pathname (string) == 0)
-    return (string);
-
-  p = (char *)strrchr (string, '/');
-  return (p ? ++p : string);
-}
-
-/* Return the full pathname of FILE.  Easy.  Filenames that begin
-   with a '/' are returned as themselves.  Other filenames have
-   the current working directory prepended.  A new string is
-   returned in either case. */
-char *
-full_pathname (file)
-     char *file;
-{
-  char *ret;
-
-  file = (*file == '~') ? bash_tilde_expand (file, 0) : savestring (file);
-
-  if (ABSPATH(file))
-    return (file);
-
-  ret = sh_makepath ((char *)NULL, file, (MP_DOCWD|MP_RMDOT));
-  free (file);
-
-  return (ret);
-}
-
-/* A slightly related function.  Get the prettiest name of this
-   directory possible. */
-static char tdir[PATH_MAX];
-
-/* Return a pretty pathname.  If the first part of the pathname is
-   the same as $HOME, then replace that with `~'.  */
-char *
-polite_directory_format (name)
-     char *name;
-{
-  char *home;
-  int l;
-
-  home = get_string_value ("HOME");
-  l = home ? strlen (home) : 0;
-  if (l > 1 && strncmp (home, name, l) == 0 && (!name[l] || name[l] == '/'))
-    {
-      strncpy (tdir + 1, name + l, sizeof(tdir) - 2);
-      tdir[0] = '~';
-      tdir[sizeof(tdir) - 1] = '\0';
-      return (tdir);
-    }
-  else
-    return (name);
-}
-
-/* Given a string containing units of information separated by colons,
-   return the next one pointed to by (P_INDEX), or NULL if there are no more.
-   Advance (P_INDEX) to the character after the colon. */
-char *
-extract_colon_unit (string, p_index)
-     char *string;
-     int *p_index;
-{
-  int i, start, len;
-  char *value;
-
-  if (string == 0)
-    return (string);
-
-  len = strlen (string);
-  if (*p_index >= len)
-    return ((char *)NULL);
-
-  i = *p_index;
-
-  /* Each call to this routine leaves the index pointing at a colon if
-     there is more to the path.  If I is > 0, then increment past the
-     `:'.  If I is 0, then the path has a leading colon.  Trailing colons
-     are handled OK by the `else' part of the if statement; an empty
-     string is returned in that case. */
-  if (i && string[i] == ':')
-    i++;
-
-  for (start = i; string[i] && string[i] != ':'; i++)
-    ;
-
-  *p_index = i;
-
-  if (i == start)
-    {
-      if (string[i])
-	(*p_index)++;
-      /* Return "" in the case of a trailing `:'. */
-      value = (char *)xmalloc (1);
-      value[0] = '\0';
-    }
-  else
-    value = substring (string, start, i);
-
-  return (value);
-}
-
-/* **************************************************************** */
-/*								    */
-/*		    Tilde Initialization and Expansion		    */
-/*								    */
-/* **************************************************************** */
-
-#if defined (PUSHD_AND_POPD)
-extern char *get_dirstack_from_string __P((char *));
-#endif
-
-static char **bash_tilde_prefixes;
-static char **bash_tilde_suffixes;
-
-/* If tilde_expand hasn't been able to expand the text, perhaps it
-   is a special shell expansion.  This function is installed as the
-   tilde_expansion_preexpansion_hook.  It knows how to expand ~- and ~+.
-   If PUSHD_AND_POPD is defined, ~[+-]N expands to directories from the
-   directory stack. */
-static char *
-bash_special_tilde_expansions (text)
-     char *text;
-{
-  char *result;
-
-  result = (char *)NULL;
-
-  if (text[0] == '+' && text[1] == '\0')
-    result = get_string_value ("PWD");
-  else if (text[0] == '-' && text[1] == '\0')
-    result = get_string_value ("OLDPWD");
-#if defined (PUSHD_AND_POPD)
-  else if (DIGIT (*text) || ((*text == '+' || *text == '-') && DIGIT (text[1])))
-    result = get_dirstack_from_string (text);
-#endif
-
-  return (result ? savestring (result) : (char *)NULL);
-}
-
-/* Initialize the tilde expander.  In Bash, we handle `~-' and `~+', as
-   well as handling special tilde prefixes; `:~" and `=~' are indications
-   that we should do tilde expansion. */
-void
-tilde_initialize ()
-{
-  static int times_called = 0;
-
-  /* Tell the tilde expander that we want a crack first. */
-  tilde_expansion_preexpansion_hook = bash_special_tilde_expansions;
-
-  /* Tell the tilde expander about special strings which start a tilde
-     expansion, and the special strings that end one.  Only do this once.
-     tilde_initialize () is called from within bashline_reinitialize (). */
-  if (times_called++ == 0)
-    {
-      bash_tilde_prefixes = strvec_create (3);
-      bash_tilde_prefixes[0] = "=~";
-      bash_tilde_prefixes[1] = ":~";
-      bash_tilde_prefixes[2] = (char *)NULL;
-
-      tilde_additional_prefixes = bash_tilde_prefixes;
-
-      bash_tilde_suffixes = strvec_create (3);
-      bash_tilde_suffixes[0] = ":";
-      bash_tilde_suffixes[1] = "=~";	/* XXX - ?? */
-      bash_tilde_suffixes[2] = (char *)NULL;
-
-      tilde_additional_suffixes = bash_tilde_suffixes;
-    }
-}
-
-/* POSIX.2, 3.6.1:  A tilde-prefix consists of an unquoted tilde character
-   at the beginning of the word, followed by all of the characters preceding
-   the first unquoted slash in the word, or all the characters in the word
-   if there is no slash...If none of the characters in the tilde-prefix are
-   quoted, the characters in the tilde-prefix following the tilde shell be
-   treated as a possible login name. */
-
-#define TILDE_END(c)	((c) == '\0' || (c) == '/' || (c) == ':')
-
-static int
-unquoted_tilde_word (s)
-     const char *s;
-{
-  const char *r;
-
-  for (r = s; TILDE_END(*r) == 0; r++)
-    {
-      switch (*r)
-	{
-	case '\\':
-	case '\'':
-	case '"':
-	  return 0;
-	}
-    }
-  return 1;
-}
-
-/* Tilde-expand S by running it through the tilde expansion library.
-   ASSIGN_P is 1 if this is a variable assignment, so the alternate
-   tilde prefixes should be enabled (`=~' and `:~', see above). */
-char *
-bash_tilde_expand (s, assign_p)
-     const char *s;
-     int assign_p;
-{
-  int old_immed, r;
-  char *ret;
-
-  old_immed = interrupt_immediately;
-  interrupt_immediately = 1;
-  tilde_additional_prefixes = assign_p ? bash_tilde_prefixes : (char **)0;
-  r = (*s == '~') ? unquoted_tilde_word (s) : 1;
-  ret = r ? tilde_expand (s) : savestring (s);
-  interrupt_immediately = old_immed;
-  return (ret);
-}
-
-/* **************************************************************** */
-/*								    */
-/*	  Functions to manipulate and search the group list	    */
-/*								    */
-/* **************************************************************** */
-
-static int ngroups, maxgroups;
-
-/* The set of groups that this user is a member of. */
-static GETGROUPS_T *group_array = (GETGROUPS_T *)NULL;
-
-#if !defined (NOGROUP)
-#  define NOGROUP (gid_t) -1
-#endif
-
-static void
-initialize_group_array ()
-{
-  register int i;
-
-  if (maxgroups == 0)
-    maxgroups = getmaxgroups ();
-
-  ngroups = 0;
-  group_array = (GETGROUPS_T *)xrealloc (group_array, maxgroups * sizeof (GETGROUPS_T));
-
-#if defined (HAVE_GETGROUPS)
-  ngroups = getgroups (maxgroups, group_array);
-#endif
-
-  /* If getgroups returns nothing, or the OS does not support getgroups(),
-     make sure the groups array includes at least the current gid. */
-  if (ngroups == 0)
-    {
-      group_array[0] = current_user.gid;
-      ngroups = 1;
-    }
-
-  /* If the primary group is not in the groups array, add it as group_array[0]
-     and shuffle everything else up 1, if there's room. */
-  for (i = 0; i < ngroups; i++)
-    if (current_user.gid == (gid_t)group_array[i])
-      break;
-  if (i == ngroups && ngroups < maxgroups)
-    {
-      for (i = ngroups; i > 0; i--)
-	group_array[i] = group_array[i - 1];
-      group_array[0] = current_user.gid;
-      ngroups++;
-    }
-
-  /* If the primary group is not group_array[0], swap group_array[0] and
-     whatever the current group is.  The vast majority of systems should
-     not need this; a notable exception is Linux. */
-  if (group_array[0] != current_user.gid)
-    {
-      for (i = 0; i < ngroups; i++)
-	if (group_array[i] == current_user.gid)
-	  break;
-      if (i < ngroups)
-	{
-	  group_array[i] = group_array[0];
-	  group_array[0] = current_user.gid;
-	}
-    }
-}
-
-/* Return non-zero if GID is one that we have in our groups list. */
-int
-#if defined (__STDC__) || defined ( _MINIX)
-group_member (gid_t gid)
-#else
-group_member (gid)
-     gid_t gid;
-#endif /* !__STDC__ && !_MINIX */
-{
-#if defined (HAVE_GETGROUPS)
-  register int i;
-#endif
-
-  /* Short-circuit if possible, maybe saving a call to getgroups(). */
-  if (gid == current_user.gid || gid == current_user.egid)
-    return (1);
-
-#if defined (HAVE_GETGROUPS)
-  if (ngroups == 0)
-    initialize_group_array ();
-
-  /* In case of error, the user loses. */
-  if (ngroups <= 0)
-    return (0);
-
-  /* Search through the list looking for GID. */
-  for (i = 0; i < ngroups; i++)
-    if (gid == (gid_t)group_array[i])
-      return (1);
-#endif
-
-  return (0);
-}
-
-char **
-get_group_list (ngp)
-     int *ngp;
-{
-  static char **group_vector = (char **)NULL;
-  register int i;
-
-  if (group_vector)
-    {
-      if (ngp)
-	*ngp = ngroups;
-      return group_vector;
-    }
-
-  if (ngroups == 0)
-    initialize_group_array ();
-
-  if (ngroups <= 0)
-    {
-      if (ngp)
-	*ngp = 0;
-      return (char **)NULL;
-    }
-
-  group_vector = strvec_create (ngroups);
-  for (i = 0; i < ngroups; i++)
-    group_vector[i] = itos (group_array[i]);
-
-  if (ngp)
-    *ngp = ngroups;
-  return group_vector;
-}
-
-int *
-get_group_array (ngp)
-     int *ngp;
-{
-  int i;
-  static int *group_iarray = (int *)NULL;
-
-  if (group_iarray)
-    {
-      if (ngp)
-	*ngp = ngroups;
-      return (group_iarray);
-    }
-
-  if (ngroups == 0)
-    initialize_group_array ();    
-
-  if (ngroups <= 0)
-    {
-      if (ngp)
-	*ngp = 0;
-      return (int *)NULL;
-    }
-
-  group_iarray = (int *)xmalloc (ngroups * sizeof (int));
-  for (i = 0; i < ngroups; i++)
-    group_iarray[i] = (int)group_array[i];
-
-  if (ngp)
-    *ngp = ngroups;
-  return group_iarray;
-}