Initial commit

Partial autotools conversion to help out Joe

More autotools migration

More autotools migration

Add platform detection for Linux vs Solaris

Move CFG_PATH out of duser.h and put into configure via --with-config-path

Forgot to define ifdef for HAVE_CONFIG_H sigh

Add configure checks for strchrnul() and strcasestr() and config.h entries
Add __NLINUX__ and __NSOLARIS__ platform checks to configure and config.h entries

Forgot compat.c for Solaris platforms sigh

Fix spelling mistake: comat.c -> compat.c

Fixed typo

Make strcasestr() and strchrnul() into separate compat files
Force everyone to use compat functions not just Solaris
Remove libsysfs from buildconf
Add libtool support (needed for libdusercompat.a)

4 files changed, 228 insertions, 0 deletions

diff --git a/include/cfg.h b/include/cfg.h
new file mode 100644
index 0000000..d3814f3
--- /dev/null
+++ b/include/cfg.h
@@ -0,0 +1,29 @@
+/**
+* duser - Manage MajorDomo lists
+* Copyright (C) 2011 Joseph Hunkeler <jhunkeler@gmail.com, jhunk@stsci.edu>
+*
+* This file is part of duser.
+*
+* duser 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.
+*
+* duser 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 duser. If not, see <http://www.gnu.org/licenses/>.
+**/
+
+#ifndef CFG_H
+#define CFG_H
+
+#define CFG_MAX		255
+int cfg_open(const char* filename); 
+void cfg_close(); 
+int cfg_get_key(char* val, const char* key); 
+
+#endif
diff --git a/include/config.h.in b/include/config.h.in
new file mode 100644
index 0000000..4b1d187
--- /dev/null
+++ b/include/config.h.in
@@ -0,0 +1,108 @@
+/* include/config.h.in.  Generated from configure.in by autoheader.  */
+
+/* duser configuration path */
+#undef CFG_PATH
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+   to 0 otherwise. */
+#undef HAVE_MALLOC
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `memset' function. */
+#undef HAVE_MEMSET
+
+/* host operating system is solaris */
+#undef HAVE_SOLARIS
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
+
+/* Define to 1 if you have the `strcasestr' function. */
+#undef HAVE_STRCASESTR
+
+/* Define to 1 if you have the `strchrnul' function. */
+#undef HAVE_STRCHRNUL
+
+/* Define to 1 if you have the `strdup' function. */
+#undef HAVE_STRDUP
+
+/* Define to 1 if you have the `strerror' function. */
+#undef HAVE_STRERROR
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strncasecmp' function. */
+#undef HAVE_STRNCASECMP
+
+/* Define to 1 if you have the `strstr' function. */
+#undef HAVE_STRSTR
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to rpl_malloc if the replacement function should be used. */
+#undef malloc
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+#undef size_t
diff --git a/include/duser.h b/include/duser.h
new file mode 100644
index 0000000..d562b33
--- /dev/null
+++ b/include/duser.h
@@ -0,0 +1,82 @@
+/**
+* duser - Manage MajorDomo lists
+* Copyright (C) 2011 Joseph Hunkeler <jhunkeler@gmail.com, jhunk@stsci.edu>
+*
+* This file is part of duser.
+*
+* duser 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.
+*
+* duser 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 duser. If not, see <http://www.gnu.org/licenses/>.
+**/
+
+#ifndef DUSER_H
+#define DUSER_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <limits.h>
+#define REGEX_MAX   255
+#define SELF	__FUNCTION__
+#ifndef HAVE_SOLARIS
+#	define FMTLIST "%20s\t%5d%23s\n"
+#else
+#	define FMTLIST "%20s\t%5d%16s\n"
+#endif
+
+typedef struct stats_t
+{
+    int lines;
+    int files;
+    int matches;
+    int added;
+    int deleted;
+    int modified;
+} stats_t;
+
+//Global statistics struct
+stats_t processed;
+
+typedef struct record_t
+{
+    int index;
+    int match;
+    int pad1;
+    char name[REGEX_MAX];
+    int pad2;
+    char file[PATH_MAX];
+    int pad3;
+} record_t;
+
+void usage();
+int strval(const char* str);
+int strfind(const char* str1, const char* str2);
+int logcleanup();
+int COM(const char* func, char *format, ...);
+record_t* find_in_file(const char* filename, const char* needle);
+int get_file_count(const char* path);
+char** get_file_list(const char* path, int count);
+void free_file_list(char** list);
+void stats_init(stats_t *s);
+int user_list(const char* needle);
+int find_in_file_ex(record_t* rec);
+int user_del(record_t* rec);
+int user_del_all(const char* needle);
+int user_del_list(const char* filename);
+int user_cmd(const int argc, char* argv[]);
+int user_choice(char c);
+int user_add(const char* filename, const char* needle);
+int user_new_list(const char* fname);
+char *strcasestr(const char *s, const char *find);
+char *strchrnul(const char* s, int c);
+#endif
diff --git a/include/version.h b/include/version.h
new file mode 100644
index 0000000..52763c1
--- /dev/null
+++ b/include/version.h
@@ -0,0 +1,9 @@
+#ifndef VERSION_H
+#define VERSION_H
+
+#define VER_MAJOR "1"
+#define VER_MINOR "0"
+#define VER_OTH " "
+
+void version();
+#endif