[patch] Patch for ls -Z

ls.c.patch (text/plain), 1.16 KB, created by Michael Tindal (RETIRED) on 2004-10-19 20:49:26 UTC

--- /var/tmp/portage/coreutils-5.2.1-r2/work/coreutils-5.2.1/src/ls.c	2004-10-19 22:45:31.962668456 -0400
+++ ls.c	2004-10-19 23:48:46.327837272 -0400
@@ -2659,9 +2659,14 @@
 #ifdef WITH_SELINUX
       if (print_scontext)
 	{
-	  int len = strlen (f->scontext);
-	  if (scontext_width < len)
-	    scontext_width = len;
+          if (f->scontext)
+	    {
+	      int len = strlen (f->scontext);
+	      if (scontext_width < len)
+	        scontext_width = len;
+            }
+          else
+            scontext_width = -1;
 	}
 #endif
     }
@@ -3268,7 +3273,11 @@
     {
       DIRED_FPUTS (buf, stdout, p - buf);
 
-      printf ("%-*s ", scontext_width, f->scontext);
+      if (f->scontext)
+        printf ("%-*s ", scontext_width, f->scontext);
+      else
+        printf ("(unknown context)");
+
       dired_pos += scontext_width;
       dired_pos++;
 
@@ -4255,8 +4264,11 @@
       if (print_group)
 	format_group (f->stat.st_gid, group_width);
     }
+  if (f->scontext != NULL)
+    printf ("%-*s ", scontext_width, f->scontext);
+  else
+    printf ("(unknown context)");
 
-  printf ("%-*s ", scontext_width, f->scontext);
   dired_pos += scontext_width;
   dired_pos++;