1 --- p7zip_4.55/CPP/myWindows/mySplitCommandLine.cpp.orig	Sat Apr 21 02:06:20 2007

     2 +++ p7zip_4.55/CPP/myWindows/mySplitCommandLine.cpp	Fri Feb 18 15:34:14 2011

     3 @@ -14,9 +14,11 @@

     4  

     5    { // define P7ZIP_HOME_DIR

     6      static char p7zip_home_dir[MAX_PATH];

     7 -    AString dir,name;

     8 -    my_windows_split_path(arguments[0],dir,name);

     9 -    snprintf(p7zip_home_dir,sizeof(p7zip_home_dir),"P7ZIP_HOME_DIR=%s/",(const char *)dir);

    10 +    static char default_path[] = "/usr/lib/7z";

    11 +    char *env;

    12 +    if ((env = getenv("P7ZIP_HOME_DIR")) == NULL)

    13 +      env = default_path;

    14 +    snprintf(p7zip_home_dir,sizeof(p7zip_home_dir),"P7ZIP_HOME_DIR=%s/",env);

    15      p7zip_home_dir[sizeof(p7zip_home_dir)-1] = 0;

    16      putenv(p7zip_home_dir);

    17    }