(Ffile_attributes): Make sure UID and GID are always positive, even

if the value is too large for a positive EMACS_INT.  Doc fix.

diff --git a/src/ChangeLog b/src/ChangeLog
index e80dd57..7d2f75d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-18  Eli Zaretskii  <eliz@gnu.org>
+
+       * dired.c (Ffile_attributes): Make sure UID and GID are always
+       positive, even if the value is too large for a positive EMACS_INT.
+       Doc fix.
+
+       * editfns.c (Fuser_login_name): Support float arguments.  Doc fix.
+
 2009-03-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * xmenu.c (xdialog_show): Move Fredisplay call ...

diff --git a/src/dired.c b/src/dired.c
index 4beac6e..7c7c757 100644 (file)
--- a/src/dired.c
+++ b/src/dired.c
@@ -906,8 +906,8 @@ ID-FORMAT if you use the returned uid or gid.
 Elements of the attribute list are:
  0. t for directory, string (name linked to) for symbolic link, or nil.
  1. Number of links to file.
- 2. File uid as a string or an integer.  If a string value cannot be
-  looked up, the integer value is returned.
+ 2. File uid as a string or a number.  If a string value cannot be
+  looked up, a numeric value, either an integer or a float, is returned.
  3. File gid, likewise.
  4. Last access time, as a list of two integers.
   First integer has high-order 16 bits of time, second has low 16 bits.
@@ -980,8 +980,16 @@ which see.  */)
   gid = s.st_gid;
   if (NILP (id_format) || EQ (id_format, Qinteger))
     {
-      values[2] = make_fixnum_or_float (uid);
-      values[3] = make_fixnum_or_float (gid);
+      if (sizeof (s.st_uid) > sizeof (uid) || uid < 0
+         || FIXNUM_OVERFLOW_P (uid))
+       values[2] = make_float ((double)s.st_uid);
+      else
+       values[2] = make_number (uid);
+      if (sizeof (s.st_gid) > sizeof (gid) || gid < 0
+         || FIXNUM_OVERFLOW_P (gid))
+       values[3] = make_float ((double)s.st_gid);
+      else
+       values[3] = make_number (gid);
     }
   else
     {