Changeset 24db42 in git

Timestamp:

Nov 2, 2012, 7:18:58 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

49fbc3fb1663015218abc676ea94783e17d0e9f1

Parents:

7fe9f8b1db2e4a62e37fab7daf03d3c2a744074a

Message:

fix: bug_tr357 (configure for findexec:getpwnam)

Location:

findexec

Files:

• configure.ac (modified) (1 diff)
• feFopen.cc (modified) (2 diffs)

findexec/configure.ac

@@ -41 +41 @@
 AC_HEADER_STDC
 AC_CHECK_HEADERS([stdlib.h string.h unistd.h pwd.h sys/param.h sys/stat.h sys/types.h])
-AC_CHECK_FUNCS(readlink getcwd getwd setenv putenv)
+AC_CHECK_FUNCS(readlink getcwd getwd getpwnam setenv putenv)
 
 # Checks for typedefs, structures, and compiler characteristics.

findexec/feFopen.cc

@@ -8 +8 @@
 #include "config.h"
 
+#if defined(HAVE_PWD_H) && defined(HAVE_GETPWNAM)
+#include <pwd.h>
+#endif
+
 //#include <reporter/reporter.h>
 
@@ -70 +74 @@
       if (dir_sep==NULL)
       {
-        Werror(" illegal ~ in filename >>%s<<",longpath);
+        char buf[256];
+        strcpy(buf,"illegal ~ in filename >>");
+        strncat(buf,longpath,235);
+        strcat(buf,"<<");
+        WerrorS(buf);
         return NULL;
       }