diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2011-05-02 18:14:53 -0400 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2011-05-02 18:14:53 -0400 |
| commit | 2fb05c7c4516d1ae3f0ad46df50043bbaa17ccb7 (patch) | |
| tree | e4cd1c7e8587dac35ed805f1daa2bcc9804308a4 /src | |
| parent | b568ec9b26ae378880409f2413da8d4b62fa4788 (diff) | |
| parent | 817b384592e730f4f832bfbe92a948970840ee33 (diff) | |
| download | duser-2fb05c7c4516d1ae3f0ad46df50043bbaa17ccb7.tar.gz | |
Merge pull request #3 from extrarius/master.
Platform sanity checks
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/Makefile.in | 12 | ||||
| -rw-r--r-- | src/user.c | 8 |
3 files changed, 11 insertions, 12 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 45d46ef..ba9d267 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,7 @@ sbin_PROGRAMS= duser -duser_SOURCES= duser.c \ +duser_SOURCES= compat.c \ + duser.c \ user.c \ util.c \ log.c \ diff --git a/src/Makefile.in b/src/Makefile.in index 6dc339b..9ffffcc 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -43,16 +43,16 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(sbindir)" PROGRAMS = $(sbin_PROGRAMS) -am_duser_OBJECTS = duser.$(OBJEXT) user.$(OBJEXT) util.$(OBJEXT) \ - log.$(OBJEXT) cfg.$(OBJEXT) +am_duser_OBJECTS = compat.$(OBJEXT) duser.$(OBJEXT) user.$(OBJEXT) \ + util.$(OBJEXT) log.$(OBJEXT) cfg.$(OBJEXT) duser_OBJECTS = $(am_duser_OBJECTS) duser_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f @@ -163,7 +163,8 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -duser_SOURCES = duser.c \ +duser_SOURCES = compat.c \ + duser.c \ user.c \ util.c \ log.c \ @@ -251,6 +252,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/duser.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/user.Po@am__quote@ @@ -32,10 +32,6 @@ #include <time.h> #include <fcntl.h> #include <libgen.h> -#ifdef _NLINUX_ -# define HAVE_STRCHRNUL -# define HAVE_STRCASESTR -#endif #include "duser.h" extern char list_path[PATH_MAX]; @@ -320,7 +316,7 @@ int get_file_count(const char* path) while((ep = readdir(dp))) { -#ifdef _NLINUX_ +#ifdef __NSOLARIS__ char path[PATH_MAX]; struct stat st; snprintf(path, PATH_MAX, "%s%s", list_path, ep->d_name); @@ -376,7 +372,7 @@ char** get_file_list(const char* path, int count) } while((ep = readdir(dp))) { -#ifdef _NLINUX_ +#ifdef __NSOLARIS__ char path[PATH_MAX]; struct stat st; snprintf(path, PATH_MAX, "%s%s", list_path, ep->d_name); |