[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/dired.c,v
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] Changes to emacs/src/dired.c,v |
Date: |
Sat, 26 Apr 2008 08:22:23 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Eli Zaretskii <eliz> 08/04/26 08:22:22
Index: dired.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/dired.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -b -r1.140 -r1.141
--- dired.c 19 Apr 2008 03:09:47 -0000 1.140
+++ dired.c 26 Apr 2008 08:22:21 -0000 1.141
@@ -942,7 +942,7 @@
char modes[10];
Lisp_Object handler;
struct gcpro gcpro1;
- EMACS_INT uid, gid, ino;
+ EMACS_INT ino;
filename = Fexpand_file_name (filename, Qnil);
@@ -977,34 +977,20 @@
#endif
}
values[1] = make_number (s.st_nlink);
- /* When make_fixnum_or_float is called below with types that are
- shorter than an int (e.g., `short'), GCC whines about comparison
- being always false due to limited range of data type. Fix by
- copying s.st_uid and s.st_gid into int variables. */
-#ifdef WINDOWSNT
- /* Windows uses signed short for the uid and gid in the stat structure,
- but we use an int for getuid (limited to the range 0-60000).
- So users with uid > 32767 need their uid patched back here. */
- uid = (unsigned short) s.st_uid;
- gid = (unsigned short) s.st_gid;
-#else
- uid = s.st_uid;
- gid = s.st_gid;
-#endif
if (NILP (id_format) || EQ (id_format, Qinteger))
{
- values[2] = make_fixnum_or_float (uid);
- values[3] = make_fixnum_or_float (gid);
+ values[2] = make_fixnum_or_float (s.st_uid);
+ values[3] = make_fixnum_or_float (s.st_gid);
}
else
{
BLOCK_INPUT;
- pw = (struct passwd *) getpwuid (uid);
+ pw = (struct passwd *) getpwuid (s.st_uid);
values[2] = (pw ? build_string (pw->pw_name)
- : make_fixnum_or_float (uid));
- gr = (struct group *) getgrgid (gid);
+ : make_fixnum_or_float (s.st_uid));
+ gr = (struct group *) getgrgid (s.st_gid);
values[3] = (gr ? build_string (gr->gr_name)
- : make_fixnum_or_float (gid));
+ : make_fixnum_or_float (s.st_gid));
UNBLOCK_INPUT;
}
values[4] = make_time (s.st_atime);
@@ -1026,11 +1012,11 @@
if (! NILP (dirname))
encoded = ENCODE_FILE (dirname);
if (! NILP (dirname) && stat (SDATA (encoded), &sdir) == 0)
- values[9] = (sdir.st_gid != gid) ? Qt : Qnil;
+ values[9] = (sdir.st_gid != s.st_gid) ? Qt : Qnil;
else /* if we can't tell, assume worst */
values[9] = Qt;
#else /* file gid will be egid */
- values[9] = (gid != getegid ()) ? Qt : Qnil;
+ values[9] = (s.st_gid != getegid ()) ? Qt : Qnil;
#endif /* BSD4_2 (or BSD4_3) */
/* Shut up GCC warnings in FIXNUM_OVERFLOW_P below. */
if (sizeof (s.st_ino) > sizeof (ino))
- [Emacs-diffs] Changes to emacs/src/dired.c,v, Eli Zaretskii, 2008/04/05
- [Emacs-diffs] Changes to emacs/src/dired.c,v, Miles Bader, 2008/04/17
- [Emacs-diffs] Changes to emacs/src/dired.c,v, Stefan Monnier, 2008/04/18
- [Emacs-diffs] Changes to emacs/src/dired.c,v,
Eli Zaretskii <=
- [Emacs-diffs] Changes to emacs/src/dired.c,v, Andreas Schwab, 2008/04/27
- [Emacs-diffs] Changes to emacs/src/dired.c,v, Andreas Schwab, 2008/04/28
- [Emacs-diffs] Changes to emacs/src/dired.c,v, Stefan Monnier, 2008/04/30