Merge from trunk.

2 files changed, 64 insertions, 13 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7362bf462a9..78fa3b501a3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,25 @@
+2012-04-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        configure: new option --enable-gcc-warnings (Bug#11207)
+        * Makefile.in (C_WARNINGS_SWITCH): Remove.
+        (WARN_CFLAGS, WERROR_CFLAGS): New macros.
+        (ALL_CFLAGS): Use new macros rather than old.
+        * process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
+        * regex.c: Ignore -Wstrict-overflow.  If !emacs, also ignore
+        -Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
+        -Wunused-result, -Wunused-variable.  This should go away once
+        the Emacs and Gnulib regex code is merged.
+        (xmalloc, xrealloc): Now static.
+
+2012-04-17  Glenn Morris  <rgm@gnu.org>
+
+        * dired.c (Fsystem_users): Doc fix.
+
+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.
@@ -42,19 +64,6 @@
 
 2012-04-14  Paul Eggert  <eggert@cs.ucla.edu>
 
-        configure: new option --enable-gcc-warnings (Bug#11207)
-        * Makefile.in (C_WARNINGS_SWITCH): Remove.
-        (WARN_CFLAGS, WERROR_CFLAGS): New macros.
-        (ALL_CFLAGS): Use new macros rather than old.
-        * process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
-        * regex.c: Ignore -Wstrict-overflow.  If !emacs, also ignore
-        -Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
-        -Wunused-result, -Wunused-variable.  This should go away once
-        the Emacs and Gnulib regex code is merged.
-        (xmalloc, xrealloc): Now static.
-
-2012-04-14  Paul Eggert  <eggert@cs.ucla.edu>
-
         Make GC_MAKE_GCPROS_NOOPS the default (Bug#9926).
         * lisp.h (GC_MARK_STACK): Default to GC_MAKE_GCPROS_NOOPS.
         * s/cygwin.h, s/darwin.h, s/freebsd.h, s/gnu.h, s/irix6-5.h, s/msdos.h:
diff --git a/src/dired.c b/src/dired.c
index 9b0f94a0760..eeae59d2801 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -1015,6 +1015,46 @@ Comparison is in lexicographic order and case is significant.  */)
   return Fstring_lessp (Fcar (f1), Fcar (f2));
 }
 
+
+DEFUN ("system-users", Fsystem_users, Ssystem_users, 0, 0, 0,
+       doc: /* Return a list of user names currently registered in the system.
+If we don't know how to determine that on this platform, just
+return a list with one element, taken from `user-real-login-name'.  */)
+     (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 +1072,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.