Add functions to get system user names, group names

Note from committer:
I removed the part that adds grp.h to AC_CHECK_HEADERS and

+#ifdef HAVE_GRP_H
 #include <grp.h>
+#endif

to src/dired.c, because the latter has unconditionally included grp.h
since 2003, and uses it eg in stat_gname.

* configure.in (AC_CHECK_FUNCS): Add getpwent, endpwent, getgrent, endgrent.

* src/dired.c (Fsystem_users, Fsystem_groups): New functions.
(syms_of_dired): Add them.

Fixes: debbugs:7900

diff --git a/ChangeLog b/ChangeLog
index 8d551e06f85d7583d63638e135cd36e335150c68..a7da9e1ad5bd593bb1922cff5300af773f181e40 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-17  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       * configure.in (AC_CHECK_FUNCS):
+       Add getpwent, endpwent, getgrent, endgrent. (Bug#7900)
+
 2012-04-16  Glenn Morris  <rgm@gnu.org>
 
        * configure.in (NS_HAVE_NSINTEGER): Remove unnecessary variable.

diff --git a/configure.in b/configure.in
index fd1327ed2a99f90e361f4a64ec5f8ea03b7929cc..c9f0cd7688c91487f2c6bf66ecc2319c8adbc0ac 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2736,6 +2736,7 @@ __fpending mblen mbrlen mbsinit strsignal setitimer ualarm \
 sendto recvfrom getsockopt setsockopt getsockname getpeername \
 gai_strerror mkstemp getline getdelim mremap fsync sync \
 difftime mempcpy mblen mbrlen posix_memalign \
+getpwent endpwent getgrent endgrent \
 cfmakeraw cfsetspeed copysign __executable_start)
 
 dnl Cannot use AC_CHECK_FUNCS

diff --git a/src/ChangeLog b/src/ChangeLog
index e321a70d4c37b36e7824970da8359723388c0b40..bcb2edee96f5ce60688ae914cfba5b3568b5ded7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-17  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       * dired.c (Fsystem_users, Fsystem_groups): New functions.  (Bug#7900)
+       (syms_of_dired): Add them.
+
 2012-04-16  Paul Eggert  <eggert@cs.ucla.edu>
 
        Fix minor alloc.c problems found by static checking.

diff --git a/src/dired.c b/src/dired.c
index 9b0f94a0760c307306fcbfea573866208a213ac8..2c634b9ca6fd2b5ee8d5e962a05509c94721d3fb 100644 (file)
--- a/src/dired.c
+++ b/src/dired.c
@@ -1015,6 +1015,45 @@ Comparison is in lexicographic order and case is significant.  */)
   return Fstring_lessp (Fcar (f1), Fcar (f2));
 }
 \f
+
+DEFUN ("system-users", Fsystem_users, Ssystem_users, 0, 0, 0,
+       doc: /* Return a list of user names currently registered in the system.
+The value may be nil if not supported on this platform.  */)
+     (void)
+{
+  Lisp_Object users = Qnil;
+#if defined(HAVE_GETPWENT) && defined(HAVE_ENDPWENT)
+  struct passwd *pw;
+
+  while ((pw = getpwent ()))
+    users = Fcons (DECODE_SYSTEM (build_string (pw->pw_name)), users);
+
+  endpwent ();
+#endif
+  if (EQ (users, Qnil))
+    /* At least current user is always known. */
+    users = Fcons (Vuser_real_login_name, Qnil);
+  return users;
+}
+
+DEFUN ("system-groups", Fsystem_groups, Ssystem_groups, 0, 0, 0,
+       doc: /* Return a list of user group names currently registered in the system.
+The value may be nil if not supported on this platform.  */)
+     (void)
+{
+  Lisp_Object groups = Qnil;
+#if defined(HAVE_GETGRENT) && defined(HAVE_ENDGRENT)
+  struct group *gr;
+  int length;
+
+  while ((gr = getgrent ()))
+    groups = Fcons (DECODE_SYSTEM (build_string (gr->gr_name)), groups);
+
+  endgrent ();
+#endif
+  return groups;
+}
+
 void
 syms_of_dired (void)
 {
@@ -1032,6 +1071,8 @@ syms_of_dired (void)
   defsubr (&Sfile_name_all_completions);
   defsubr (&Sfile_attributes);
   defsubr (&Sfile_attributes_lessp);
+  defsubr (&Ssystem_users);
+  defsubr (&Ssystem_groups);
 
   DEFVAR_LISP ("completion-ignored-extensions", Vcompletion_ignored_extensions,
               doc: /* Completion ignores file names ending in any string in this list.