Changeset 1418:9d792ba0ff49 for browser.c

Timestamp:

1999-12-29 10:35:00 (9 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Fix the use of link_is_dir() in the file browser. This should fix
the bug reported by John Yates <yates@…> on Dec 07 1999.
(Details noted by Byrial Jensen <byrial@…> on Dec 09 1999.)

Files:

• browser.c (modified) (5 diffs)

browser.c

@@ -123 +123 @@
 }
 
-static int link_is_dir (const char *path)
+static int link_is_dir (const char *folder, const char *path)
 {
   struct stat st;
-
-  if (stat (path, &st) == 0)
+  char fullpath[_POSIX_PATH_MAX];
+  
+  snprintf (fullpath, sizeof (fullpath), "%s/%s", folder, path);
+  
+  if (stat (fullpath, &st) == 0)
     return (S_ISDIR (st.st_mode));
   else
-    return (-1);
+    return 0;
 }
 
@@ -493 +496 @@
 {
   struct folder_file *ff = &(((struct folder_file *)menu->data)[n]);
-  if (S_ISDIR (ff->mode) || (S_ISLNK (ff->mode) && link_is_dir (ff->name)))
+  if (S_ISDIR (ff->mode) || (S_ISLNK (ff->mode) && link_is_dir (LastDir, ff->name)))
   {
     mutt_error _("Can't attach a directory!");
@@ -619 +622 @@
         if (S_ISDIR (state.entry[menu->current].mode) ||
             (S_ISLNK (state.entry[menu->current].mode) &&
-            link_is_dir (state.entry[menu->current].name)) 
+            link_is_dir (LastDir, state.entry[menu->current].name)) 
 #ifdef USE_IMAP
             || state.entry[menu->current].notfolder
@@ -844 +847 @@
         if (!state.imap_browse)
 #endif
-        {/* add '/' at the end of the directory name */
-        int len=mutt_strlen(LastDir);
-        if (sizeof (buf) > len)
-          buf[len]='/';
+        {
+          /* add '/' at the end of the directory name */
+          int len=mutt_strlen(LastDir);
+          if (sizeof (buf) > len)
+            buf[len]='/';
         }
 
@@ -1058 +1062 @@
         if (S_ISDIR (state.entry[menu->current].mode) ||
             (S_ISLNK (state.entry[menu->current].mode) &&
-            link_is_dir (state.entry[menu->current].name)))
+            link_is_dir (LastDir, state.entry[menu->current].name)))
         {
           mutt_error _("Can't view a directory");