author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Mon, 11 Mar 2013 10:38:09 -0700 | |
branch | s11-update |
changeset 2520 | ceec631e74d1 |
parent 138 | 089c2065503f |
permissions | -rw-r--r-- |
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 |
} |