# HG changeset patch
# User Olaf Hering <[email protected]>
# Date 1306149751 -7200
# Branch HEAD
# Node ID 5f1f453e3bad1cf1c12f6f875f41b4f213247053
# Parent  eaa08e0a37bd61192380b52ebe53aed3e9f6dd4f
folder_file: use existing ->mode member for st_mode

Use existing ->mode member instead of stat->st_mode.
This is a prereq before removing struct stat in struct folder_file.

Signed-off-by: Olaf Hering <[email protected]>

diff -r eaa08e0a37bd -r 5f1f453e3bad browser.c
--- a/browser.c Mon May 23 13:22:31 2011 +0200
+++ b/browser.c Mon May 23 13:22:31 2011 +0200
@@ -200,9 +200,9 @@ folder_format_str (char *dest, size_t de
        s = NONULL (folder->ff->name);
 
       snprintf (fn, sizeof (fn), "%s%s", s,
-               folder->ff->local ? (S_ISLNK (folder->ff->st->st_mode) ? "@" :  
        
-                                 (S_ISDIR (folder->ff->st->st_mode) ? "/" : 
-                                  ((folder->ff->st->st_mode & S_IXUSR) != 0 ? 
"*" : ""))) : "");
+               folder->ff->local ? (S_ISLNK (folder->ff->mode) ? "@" :         
+                                 (S_ISDIR (folder->ff->mode) ? "/" : 
+                                  ((folder->ff->mode & S_IXUSR) != 0 ? "*" : 
""))) : "");
       
       mutt_format_s (dest, destlen, fmt, fn);
       break;
@@ -211,16 +211,16 @@ folder_format_str (char *dest, size_t de
       if (folder->ff->local)
       {
        snprintf (permission, sizeof (permission), "%c%c%c%c%c%c%c%c%c%c",
-                 S_ISDIR(folder->ff->st->st_mode) ? 'd' : 
(S_ISLNK(folder->ff->st->st_mode) ? 'l' : '-'),
-                 (folder->ff->st->st_mode & S_IRUSR) != 0 ? 'r': '-',
-                 (folder->ff->st->st_mode & S_IWUSR) != 0 ? 'w' : '-',
-                 (folder->ff->st->st_mode & S_ISUID) != 0 ? 's' : 
(folder->ff->st->st_mode & S_IXUSR) != 0 ? 'x': '-',
-                 (folder->ff->st->st_mode & S_IRGRP) != 0 ? 'r' : '-',
-                 (folder->ff->st->st_mode & S_IWGRP) != 0 ? 'w' : '-',
-                 (folder->ff->st->st_mode & S_ISGID) != 0 ? 's' : 
(folder->ff->st->st_mode & S_IXGRP) != 0 ? 'x': '-',
-                 (folder->ff->st->st_mode & S_IROTH) != 0 ? 'r' : '-',
-                 (folder->ff->st->st_mode & S_IWOTH) != 0 ? 'w' : '-',
-                 (folder->ff->st->st_mode & S_ISVTX) != 0 ? 't' : 
(folder->ff->st->st_mode & S_IXOTH) != 0 ? 'x': '-');
+                 S_ISDIR(folder->ff->mode) ? 'd' : (S_ISLNK(folder->ff->mode) 
? 'l' : '-'),
+                 (folder->ff->mode & S_IRUSR) != 0 ? 'r': '-',
+                 (folder->ff->mode & S_IWUSR) != 0 ? 'w' : '-',
+                 (folder->ff->mode & S_ISUID) != 0 ? 's' : (folder->ff->mode & 
S_IXUSR) != 0 ? 'x': '-',
+                 (folder->ff->mode & S_IRGRP) != 0 ? 'r' : '-',
+                 (folder->ff->mode & S_IWGRP) != 0 ? 'w' : '-',
+                 (folder->ff->mode & S_ISGID) != 0 ? 's' : (folder->ff->mode & 
S_IXGRP) != 0 ? 'x': '-',
+                 (folder->ff->mode & S_IROTH) != 0 ? 'r' : '-',
+                 (folder->ff->mode & S_IWOTH) != 0 ? 'w' : '-',
+                 (folder->ff->mode & S_ISVTX) != 0 ? 't' : (folder->ff->mode & 
S_IXOTH) != 0 ? 'x': '-');
        mutt_format_s (dest, destlen, fmt, permission);
       }
 #ifdef USE_IMAP

Reply via email to