Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/p7zip/patches/plugindir.patch
author Kristina Tripp <Kristina.Tripp@oracle.com>
Mon, 20 Oct 2014 13:13:15 -0700
branchs11u2-sru
changeset 3407 e5c7eb70e0b8
parent 138 089c2065503f
permissions -rw-r--r--
18354422 facter cannot parse the output of GNU uptime 18960283 problem in UTILITY/PUPPET 18960296 Update Facter to 2.1.0 19357281 facter --help doesn't work 19402424 puppet error when no swap devices configured 19646677 facter-19 package not installed if ruby-19 not installed 19596952 Update facter 2.1.0 license 17797881 Add facter support for ldoms
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
138
089c2065503f 7016734 move pz7ip from sfw to userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     1
 
--- p7zip_4.55/CPP/myWindows/mySplitCommandLine.cpp.orig	Sat Apr 21 02:06:20 2007
089c2065503f 7016734 move pz7ip from sfw to userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     2
 
+++ p7zip_4.55/CPP/myWindows/mySplitCommandLine.cpp	Fri Feb 18 15:34:14 2011
089c2065503f 7016734 move pz7ip from sfw to userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     3
 
@@ -14,9 +14,11 @@
089c2065503f 7016734 move pz7ip from sfw to userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     4
089c2065503f 7016734 move pz7ip from sfw to userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     5
 
   { // define P7ZIP_HOME_DIR
089c2065503f 7016734 move pz7ip from sfw to userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     6
 
     static char p7zip_home_dir[MAX_PATH];
089c2065503f 7016734 move pz7ip from sfw to userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     7
 
-    AString dir,name;
089c2065503f 7016734 move pz7ip from sfw to userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     8
 
-    my_windows_split_path(arguments[0],dir,name);
089c2065503f 7016734 move pz7ip from sfw to userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     9
 
-    snprintf(p7zip_home_dir,sizeof(p7zip_home_dir),"P7ZIP_HOME_DIR=%s/",(const char *)dir);
089c2065503f 7016734 move pz7ip from sfw to userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    10
 
+    static char default_path[] = "/usr/lib/7z";
089c2065503f 7016734 move pz7ip from sfw to userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    11
 
+    char *env;
089c2065503f 7016734 move pz7ip from sfw to userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    12
 
+    if ((env = getenv("P7ZIP_HOME_DIR")) == NULL)
089c2065503f 7016734 move pz7ip from sfw to userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    13
 
+      env = default_path;
089c2065503f 7016734 move pz7ip from sfw to userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    14
 
+    snprintf(p7zip_home_dir,sizeof(p7zip_home_dir),"P7ZIP_HOME_DIR=%s/",env);
089c2065503f 7016734 move pz7ip from sfw to userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    15
 
     p7zip_home_dir[sizeof(p7zip_home_dir)-1] = 0;
089c2065503f 7016734 move pz7ip from sfw to userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    16
 
     putenv(p7zip_home_dir);
089c2065503f 7016734 move pz7ip from sfw to userland
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    17
 
   }
upstream/oracle/userland-gate