# HG changeset patch
# User Olaf Hering <[email protected]>
# Date 1306149750 -7200
# Branch HEAD
# Node ID 93427f87ba7ebacf2dbafaf5491804dad78f1e81
# Parent  dfddd1a8f912355a95c373f6c34189309e149383
folder_file: introduce and use new ->uid member

Add and use new uid member.
This is a prereq before removing struct stat in struct folder_file.

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

diff -r dfddd1a8f912 -r 93427f87ba7e browser.c
--- a/browser.c Mon May 23 13:22:30 2011 +0200
+++ b/browser.c Mon May 23 13:22:30 2011 +0200
@@ -298,12 +298,12 @@ folder_format_str (char *dest, size_t de
     case 'u':
       if (folder->ff->local)
       {
-       if ((pw = getpwuid (folder->ff->st->st_uid)))
+       if ((pw = getpwuid (folder->ff->uid)))
          mutt_format_s (dest, destlen, fmt, pw->pw_name);
        else
        {
          snprintf (tmp, sizeof (tmp), "%%%sld", fmt);
-         snprintf (dest, destlen, tmp, folder->ff->st->st_uid);
+         snprintf (dest, destlen, tmp, folder->ff->uid);
        }
       }
       else
@@ -344,6 +344,7 @@ static void add_folder (MUTTMENU *m, str
     (state->entry)[state->entrylen].mtime = s->st_mtime;
     (state->entry)[state->entrylen].size = s->st_size;
     (state->entry)[state->entrylen].gid = s->st_gid;
+    (state->entry)[state->entrylen].uid = s->st_uid;
     
     (state->entry)[state->entrylen].st = safe_malloc (sizeof (struct stat));
     memcpy ((state->entry)[state->entrylen].st, s, sizeof (struct stat));
diff -r dfddd1a8f912 -r 93427f87ba7e browser.h
--- a/browser.h Mon May 23 13:22:30 2011 +0200
+++ b/browser.h Mon May 23 13:22:30 2011 +0200
@@ -24,6 +24,7 @@ struct folder_file
   mode_t mode;
   off_t size;
   time_t mtime;
+  uid_t uid;
   gid_t gid;
   struct stat *st;
 

Reply via email to