Mercurial > hg > xemacs-beta

diff src/dired.c @ 771:943eaba38521

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-13 08:51:24 by ben] The big ben-mule-21-5 check-in! Various files were added and deleted. See CHANGES-ben-mule. There are still some test suite failures. No crashes, though. Many of the failures have to do with problems in the test suite itself rather than in the actual code. I'll be addressing these in the next day or so -- none of the test suite failures are at all critical. Meanwhile I'll be trying to address the biggest issues -- i.e. build or run failures, which will almost certainly happen on various platforms. All comments should be sent to ben@xemacs.org -- use a Cc: if necessary when sending to mailing lists. There will be pre- and post- tags, something like pre-ben-mule-21-5-merge-in, and post-ben-mule-21-5-merge-in.
author ben
date Wed, 13 Mar 2002 08:54:06 +0000
parents 336a418893b5
children a5954632b187
line wrap: on
line diff
--- a/src/dired.c	Fri Mar 08 13:33:14 2002 +0000
+++ b/src/dired.c	Wed Mar 13 08:54:06 2002 +0000
@@ -1,5 +1,6 @@
  /* Lisp functions for making directory listings.
    Copyright (C) 1985, 1986, 1992, 1993, 1994 Free Software Foundation, Inc.
+   Copyright (C) 2001 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -49,7 +50,7 @@
 close_directory_unwind (Lisp_Object unwind_obj)
 {
   DIR *d = (DIR *)get_opaque_ptr (unwind_obj);
-  closedir (d);
+  qxe_closedir (d);
   free_opaque_ptr (unwind_obj);
   return Qnil;
 }
@@ -76,7 +77,7 @@
   Lisp_Object handler;
   struct re_pattern_buffer *bufp = NULL;
   int speccount = specpdl_depth ();
-  char *statbuf, *statbuf_tail;
+  Intbyte *statbuf, *statbuf_tail;
 
   struct gcpro gcpro1, gcpro2;
   GCPRO2 (directory, list);
@@ -101,7 +102,7 @@
   directory = Ffile_name_as_directory (directory);
   directorylen = XSTRING_LENGTH (directory);
 
-  statbuf = (char *)alloca (directorylen + MAXNAMLEN + 1);
+  statbuf = (Intbyte *) alloca (directorylen + MAXNAMLEN + 1);
   memcpy (statbuf, XSTRING_DATA (directory), directorylen);
   statbuf_tail = statbuf + directorylen;
 
@@ -124,7 +125,7 @@
   /* Do this opendir after anything which might signal an error.
      NOTE: the above comment is old; previously, there was no
      unwind-protection in case of error, but now there is.  */
-  d = opendir ((char *) XSTRING_DATA (directory));
+  d = qxe_opendir (XSTRING_DATA (directory));
   if (!d)
     report_file_error ("Opening directory", directory);
 
@@ -136,7 +137,7 @@
   /* Loop reading blocks */
   while (1)
     {
-      DIRENTRY *dp = readdir (d);
+      DIRENTRY *dp = qxe_readdir (d);
       int len;
 
       if (!dp)
@@ -154,7 +155,7 @@
 	      memcpy (statbuf_tail, dp->d_name, len);
 	      statbuf_tail[len] = 0;
 
-	      if (xemacs_stat (statbuf, &st) == 0
+	      if (qxe_stat (statbuf, &st) == 0
 		  && (st.st_mode & S_IFMT) == S_IFDIR)
 		dir_p = 1;
 
@@ -174,7 +175,7 @@
 	  }
 	}
     }
-  unbind_to (speccount, Qnil);	/* This will close the dir */
+  unbind_to (speccount);	/* This will close the dir */
 
   if (NILP (nosort))
     list = Fsort (Fnreverse (list), Qstring_lessp);
@@ -248,7 +249,7 @@
   Bytecount len = NAMLEN (dp);
   Bytecount pos = XSTRING_LENGTH (directory);
   int value;
-  char *fullname = (char *) alloca (len + pos + 2);
+  Intbyte *fullname = (Intbyte *) alloca (len + pos + 2);
 
   memcpy (fullname, XSTRING_DATA (directory), pos);
   if (!IS_DIRECTORY_SEP (fullname[pos - 1]))
@@ -261,11 +262,11 @@
   /* We want to return success if a link points to a nonexistent file,
      but we want to return the status for what the link points to,
      in case it is a directory.  */
-  value = lstat (fullname, st_addr);
+  value = qxe_lstat (fullname, st_addr);
   if (S_ISLNK (st_addr->st_mode))
-    xemacs_stat (fullname, st_addr);
+    qxe_stat (fullname, st_addr);
 #else
-  value = xemacs_stat (fullname, st_addr);
+  value = qxe_stat (fullname, st_addr);
 #endif
   return value;
 }
@@ -279,7 +280,7 @@
   if (!NILP (obj))
     {
       d = (DIR *)get_opaque_ptr (obj);
-      closedir (d);
+      qxe_closedir (d);
       free_opaque_ptr (obj);
     }
   free_cons (XCONS (locative));
@@ -336,7 +337,7 @@
 
   for (passcount = !!all_flag; NILP (bestmatch) && passcount < 2; passcount++)
     {
-      d = opendir ((char *) XSTRING_DATA (Fdirectory_file_name (directory)));
+      d = qxe_opendir (XSTRING_DATA (Fdirectory_file_name (directory)));
       if (!d)
 	report_file_error ("Opening directory", directory);
       XCAR (locative) = make_opaque_ptr ((void *)d);
@@ -353,10 +354,10 @@
           int ignored_extension_p = 0;
 	  Intbyte *d_name;
 
-	  dp = readdir (d);
+	  dp = qxe_readdir (d);
 	  if (!dp) break;
 
-	  /* Cast to Intbyte* is OK, as readdir() Mule-encapsulates.  */
+	  /* Cast to Intbyte* is OK, as qxe_readdir() Mule-encapsulates.  */
 	  d_name = (Intbyte *) dp->d_name;
 	  len = NAMLEN (dp);
 	  cclen = bytecount_to_charcount (d_name, len);
@@ -492,12 +493,12 @@
               bestmatchsize = matchsize;
             }
         }
-      closedir (d);
+      qxe_closedir (d);
       free_opaque_ptr (XCAR (locative));
       XCAR (locative) = Qnil;
     }
 
-  unbind_to (speccount, Qnil);
+  unbind_to (speccount);
 
   UNGCPRO;
 
@@ -641,16 +642,14 @@
 #ifndef WIN32_NATIVE
       slow_down_interrupts ();
       setpwent ();
-      while ((pwd = getpwent ()))
+      while ((pwd = qxe_getpwent ()))
         {
           QUIT;
 	  DO_REALLOC (user_cache.user_names, user_cache.size,
 		      user_cache.length + 1, struct user_name);
-	  TO_INTERNAL_FORMAT (C_STRING, pwd->pw_name,
-			      MALLOC,
-			      (user_cache.user_names[user_cache.length].ptr,
-			       user_cache.user_names[user_cache.length].len),
-			      Qnative);
+	  user_cache.user_names[user_cache.length].ptr =
+	    (Intbyte *) xstrdup (pwd->pw_name);
+	  user_cache.user_names[user_cache.length].len = strlen (pwd->pw_name);
 	  user_cache.length++;
         }
 #else
@@ -672,23 +671,16 @@
 				   make_int (GetLastError ()));
 	      for (i = 0; i < (int) entriesread; i++)
 		{
-		  int nout =
-		    WideCharToMultiByte (CP_ACP, WC_COMPOSITECHECK,
-					 bufptr[i].usri0_name,
-					 -1, 0, 0, "~", 0);
-		  void *outp = alloca (nout);
-		  WideCharToMultiByte (CP_ACP, WC_COMPOSITECHECK,
-				       bufptr[i].usri0_name, -1,
-				       (LPSTR) outp, nout, "~", 0);
 		  DO_REALLOC (user_cache.user_names, user_cache.size,
 			      user_cache.length + 1, struct user_name);
-		  TO_INTERNAL_FORMAT (C_STRING, outp,
+		  TO_INTERNAL_FORMAT (C_STRING,
+				      bufptr[i].usri0_name,
 				      MALLOC,
 				      (user_cache.
 				       user_names[user_cache.length].ptr,
 				       user_cache.
 				       user_names[user_cache.length].len),
-				      Qmswindows_tstr);
+				      Qmswindows_unicode);
 		  user_cache.length++;
 		}
 	      xNetApiBufferFree (bufptr);
@@ -700,7 +692,7 @@
 	  Extbyte name[2 * (UNLEN + 1)];
 	  DWORD length = sizeof (name);
 	  
-	  if (GetUserName (name, &length))
+	  if (qxeGetUserName (name, &length))
 	    {
 	      DO_REALLOC (user_cache.user_names, user_cache.size,
 			  user_cache.length + 1, struct user_name);
@@ -717,7 +709,7 @@
 #endif
 
       XCAR (cache_incomplete_p) = Qnil;
-      unbind_to (speccount, Qnil);
+      unbind_to (speccount);
 
       EMACS_GET_TIME (user_cache.last_rebuild_time);
     }
@@ -783,23 +775,23 @@
 
 
 Lisp_Object
-make_directory_hash_table (const char *path)
+make_directory_hash_table (const Intbyte *path)
 {
   DIR *d;
-  if ((d = opendir (path)))
+  if ((d = qxe_opendir (path)))
     {
       DIRENTRY *dp;
       Lisp_Object hash =
 	make_lisp_hash_table (20, HASH_TABLE_NON_WEAK, HASH_TABLE_EQUAL);
 
-      while ((dp = readdir (d)))
+      while ((dp = qxe_readdir (d)))
 	{
 	  Bytecount len = NAMLEN (dp);
 	  if (DIRENTRY_NONEMPTY (dp))
-	    /* Cast to Intbyte* is OK, as readdir() Mule-encapsulates.  */
+	    /* Cast to Intbyte* is OK, as qxe_readdir() Mule-encapsulates.  */
 	    Fputhash (make_string ((Intbyte *) dp->d_name, len), Qt, hash);
 	}
-      closedir (d);
+      qxe_closedir (d);
       return hash;
     }
   else
@@ -862,7 +854,7 @@
       return call2 (handler, Qfile_attributes, filename);
     }
 
-  if (lstat ((char *) XSTRING_DATA (filename), &s) < 0)
+  if (qxe_lstat (XSTRING_DATA (filename), &s) < 0)
     {
       UNGCPRO;
       return Qnil;
@@ -874,14 +866,14 @@
 
 #if 0 /* #### shouldn't this apply to WIN32_NATIVE and maybe CYGWIN? */
   {
-    char *tmpnam = (char *) XSTRING_DATA (Ffile_name_nondirectory (filename));
-    int l = strlen (tmpnam);
+    Intbyte *tmpnam = XSTRING_DATA (Ffile_name_nondirectory (filename));
+    Bytecount l = qxestrlen (tmpnam);
 
     if (l >= 5
 	&& S_ISREG (s.st_mode)
-	&& (stricmp (&tmpnam[l - 4], ".com") == 0 ||
-	    stricmp (&tmpnam[l - 4], ".exe") == 0 ||
-	    stricmp (&tmpnam[l - 4], ".bat") == 0))
+	&& (qxestrcasecmp (&tmpnam[l - 4], ".com") == 0 ||
+	    qxestrcasecmp (&tmpnam[l - 4], ".exe") == 0 ||
+	    qxestrcasecmp (&tmpnam[l - 4], ".bat") == 0))
       {
 	s.st_mode |= S_IEXEC;
       }
@@ -919,7 +911,7 @@
   {
     struct stat sdir;
 
-    if (!NILP (directory) && xemacs_stat ((char *) XSTRING_DATA (directory), &sdir) == 0)
+    if (!NILP (directory) && qxe_stat (XSTRING_DATA (directory), &sdir) == 0)
       values[9] = (sdir.st_gid != s.st_gid) ? Qt : Qnil;
     else                        /* if we can't tell, assume worst */
       values[9] = Qt;