Upgrade from popt 1.2 to a cut-down 1.5

[rsync/rsync.git] / popt / findme.c

diff --git a/popt-1.2/findme.c b/popt/findme.c
similarity index 68%
rename from popt-1.2/findme.c
rename to popt/findme.c
index 1cda62c..6d1b41c 100644 (file)
--- a/popt-1.2/findme.c
+++ b/popt/findme.c
@@ -2,27 +2,10 @@
    file accompanying popt source distributions, available from 
    ftp://ftp.redhat.com/pub/code/popt */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#ifdef __NeXT
-/* access macros are not declared in non posix mode in unistd.h -
- don't try to use posix on NeXTstep 3.3 ! */ 
-#include <libc.h>
-#endif
-
-#if HAVE_ALLOCA_H
-# include <alloca.h>
-#endif
-
+#include "system.h"
 #include "findme.h"
 
-char * findProgramPath(char * argv0) {
+const char * findProgramPath(const char * argv0) {
     char * path = getenv("PATH");
     char * pathbuf;
     char * start, * chptr;
@@ -31,7 +14,7 @@ char * findProgramPath(char * argv0) {
     /* If there is a / in the argv[0], it has to be an absolute
        path */
     if (strchr(argv0, '/'))
-       return strdup(argv0);
+       return xstrdup(argv0);
 
     if (!path) return NULL;