2 files changed, 138 insertions, 0 deletions
diff --git a/gnulib b/gnulib
deleted file mode 160000
-Subproject 443bc5ffcf7429e557f4a371b0661abe98ddbc1
diff --git a/gnulib/lib/findprog.c b/gnulib/lib/findprog.c
new file mode 100644
index 0000000..81b641d
--- /dev/null
+++ b/gnulib/lib/findprog.c
@@ -0,0 +1,138 @@
+/* Locating a program in PATH.
+   Copyright (C) 2001-2004, 2006-2011 Free Software Foundation, Inc.
+   Written by Bruno Haible <haible@clisp.cons.org>, 2001.
+
+   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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+
+#include <config.h>
+
+/* Specification.  */
+#include "findprog.h"
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+/* Avoid collision between findprog.c and findprog-lgpl.c.  */
+#if IN_FINDPROG_LGPL || ! GNULIB_FINDPROG_LGPL
+
+#if !IN_FINDPROG_LGPL
+# include "xalloc.h"
+#endif
+#include "concat-filename.h"
+
+
+const char *
+find_in_path (const char *progname)
+{
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, Cygwin, OS/2, DOS */
+  /* The searching rules with .COM, .EXE, .BAT, .CMD etc. suffixes are
+     too complicated.  Leave it to the OS.  */
+  return progname;
+#else
+  /* Unix */
+  char *path;
+  char *path_rest;
+  char *cp;
+
+  if (strchr (progname, '/') != NULL)
+    /* If progname contains a slash, it is either absolute or relative to
+       the current directory.  PATH is not used.  */
+    return progname;
+
+  path = getenv ("PATH");
+  if (path == NULL || *path == '\0')
+    /* If PATH is not set, the default search path is implementation
+       dependent.  */
+    return progname;
+
+  /* Make a copy, to prepare for destructive modifications.  */
+# if !IN_FINDPROG_LGPL
+  path = xstrdup (path);
+# else
+  path = strdup (path);
+  if (path == NULL)
+    /* Out of memory.  */
+    return progname;
+# endif
+  for (path_rest = path; ; path_rest = cp + 1)
+    {
+      const char *dir;
+      bool last;
+      char *progpathname;
+
+      /* Extract next directory in PATH.  */
+      dir = path_rest;
+      for (cp = path_rest; *cp != '\0' && *cp != ':'; cp++)
+        ;
+      last = (*cp == '\0');
+      *cp = '\0';
+
+      /* Empty PATH components designate the current directory.  */
+      if (dir == cp)
+        dir = ".";
+
+      /* Concatenate dir and progname.  */
+# if !IN_FINDPROG_LGPL
+      progpathname = xconcatenated_filename (dir, progname, NULL);
+# else
+      progpathname = concatenated_filename (dir, progname, NULL);
+      if (progpathname == NULL)
+        {
+          /* Out of memory.  */
+          free (path);
+          return progname;
+        }
+# endif
+
+      /* On systems which have the eaccess() system call, let's use it.
+         On other systems, let's hope that this program is not installed
+         setuid or setgid, so that it is ok to call access() despite its
+         design flaw.  */
+      if (eaccess (progpathname, X_OK) == 0)
+        {
+          /* Found!  */
+          if (strcmp (progpathname, progname) == 0)
+            {
+              free (progpathname);
+
+              /* Add the "./" prefix for real, that xconcatenated_filename()
+                 optimized away.  This avoids a second PATH search when the
+                 caller uses execlp/execvp.  */
+              progpathname = XNMALLOC (2 + strlen (progname) + 1, char);
+              progpathname[0] = '.';
+              progpathname[1] = '/';
+              memcpy (progpathname + 2, progname, strlen (progname) + 1);
+            }
+
+          free (path);
+          return progpathname;
+        }
+
+      free (progpathname);
+
+      if (last)
+        break;
+    }
+
+  /* Not found in PATH.  An error will be signalled at the first call.  */
+  free (path);
+  return progname;
+#endif
+}
+
+#endif