components/tree/patches/tree.c.patch
author Sean Wilcox <sean.wilcox@oracle.com>
Fri, 24 Mar 2017 14:28:46 -0600
changeset 7799 e35d3ee6d1b8
parent 5583 26ddfc624753
permissions -rw-r--r--
PSARC 2017/039 cloudbase-init: Portable cloud image initialization with ConfigDrive 25615046 cloudbase-init should support configdrive on solaris 25027429 Enable cloudbase-init debug in config file
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5583
26ddfc624753 22862722 Update tree to version 1.7.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     1
Fix S_ISDOOR/S_IFDOOR spelling mistake.
26ddfc624753 22862722 Update tree to version 1.7.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     2
26ddfc624753 22862722 Update tree to version 1.7.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     3
This fix has been sent upstream.
26ddfc624753 22862722 Update tree to version 1.7.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     4
26ddfc624753 22862722 Update tree to version 1.7.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     5
--- tree-1.7.0/tree.c.orig	2016-03-03 06:04:25.447097615 -0800
26ddfc624753 22862722 Update tree to version 1.7.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     6
+++ tree-1.7.0/tree.c	2016-03-03 06:04:49.600428587 -0800
26ddfc624753 22862722 Update tree to version 1.7.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     7
@@ -1258,7 +1258,7 @@
26ddfc624753 22862722 Update tree to version 1.7.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     8
   else if (m == S_IFIFO) return '|';
26ddfc624753 22862722 Update tree to version 1.7.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     9
   else if (m == S_IFLNK) return '@'; /* Here, but never actually used though. */
26ddfc624753 22862722 Update tree to version 1.7.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    10
 #ifdef S_IFDOOR
26ddfc624753 22862722 Update tree to version 1.7.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    11
-  else if (m == S_ISDOOR) return '>';
26ddfc624753 22862722 Update tree to version 1.7.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    12
+  else if (m == S_IFDOOR) return '>';
26ddfc624753 22862722 Update tree to version 1.7.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    13
 #endif
26ddfc624753 22862722 Update tree to version 1.7.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    14
   else if ((m == S_IFREG) && (mode & (S_IXUSR | S_IXGRP | S_IXOTH))) return '*';
26ddfc624753 22862722 Update tree to version 1.7.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    15
   return 0;