Changeset 8f5afcf for zcrypt.c

Timestamp:

Jul 13, 2011, 11:51:37 PM (13 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

30d0cf7 (diff), a7b125d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge a7b125d60dcd2a22d2dfb2634982352acdcbc51c into 30d0cf75d34271caa5cca99bfac799fb7aaed6d7

File:

• zcrypt.c (modified) (2 diffs)

zcrypt.c

@@ -411 +411 @@
   int length[MAX_SEARCH], i;
   char buffer[MAX_BUFF];
+  const char *home;
   char *filename;
   char result[MAX_SEARCH][MAX_BUFF];
@@ -433 +434 @@
 
   /* Open~/.crypt-table */
-  filename = g_strdup_printf("%s/.crypt-table", getenv("HOME"));
+  home = getenv("HOME");
+  if (home == NULL)
+    home = g_get_home_dir();
+  filename = g_build_filename(home, ".crypt-table", NULL);
   fsearch = fopen(filename, "r");
   if (fsearch)