{"thread":{"id":"285","subject":"[PATCH] Cleanup sha1_file_directory initialization","startedAt":"2005-04-24T13:07:30Z","lastAt":"2005-04-24T13:07:30Z","messageCount":1,"participants":["Jonas Fonseca"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"1520","messageId":"20050424130730.GA10649@diku.dk","threadId":"285","inReplyTo":null,"subject":"[PATCH] Cleanup sha1_file_directory initialization","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2005-04-24T13:07:30Z","receivedAt":"2005-04-24T13:07:30Z","isPatch":true,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":"Use get_object_directory() when initializing sha1_file_directory\nand make sha1_file_name() work on the global.\n\nSigned-off-by: Jonas Fonseca <fonseca@diku.dk>\n\n---\nActually the initiailzation in ls-tree.c can be removed because call to\nlist() will end up in sha1_file_name() which will do it.\n\ncommit 6a06750a72231eaf285f9fbd2bcb88a39b699679\ntree bec1c4178131a67de1fa639a274b13adec21c1e5\nparent 32141512fff2d42c0233c07610db866926c89a75\nauthor Jonas Fonseca <jonas@cvalda.(none)> 1114346881 +0200\ncommitter Jonas Fonseca <jonas@cvalda.(none)> 1114346881 +0200\n\nIndex: ls-tree.c\n===================================================================\n--- 31e9af73983d640090508b06784ef7db4816c957/ls-tree.c  (mode:100644 sha1:bd99f9ac7b2d6dc23c1ec7d8f03877c20afec63f)\n+++ bec1c4178131a67de1fa639a274b13adec21c1e5/ls-tree.c  (mode:100644 sha1:b630f69d8430f18f52799cf32787059b4427f3e8)\n@@ -104,9 +104,8 @@ int main(int argc, char **argv)\n \t\tusage(ls_tree_usage);\n \tif (get_sha1_hex(argv[1], sha1) < 0)\n \t\tusage(ls_tree_usage);\n-\tsha1_file_directory = getenv(DB_ENVIRONMENT);\n-\tif (!sha1_file_directory)\n-\t\tsha1_file_directory = DEFAULT_DB_ENVIRONMENT;\n+\n+\tsha1_file_directory = get_object_directory();\n \tif (list(sha1) < 0)\n \t\tdie(\"list failed\");\n \treturn 0;\nIndex: read-cache.c\n===================================================================\n--- 31e9af73983d640090508b06784ef7db4816c957/read-cache.c  (mode:100644 sha1:f67aceb6b12f6d9cadf6a80bb1d33cf1bcd7f619)\n+++ bec1c4178131a67de1fa639a274b13adec21c1e5/read-cache.c  (mode:100644 sha1:deb60df8cbb4f9ec8367f4ff96c62e383b5699e8)\n@@ -183,9 +183,7 @@ int read_cache(void)\n \tif (active_cache)\n \t\treturn error(\"more than one cachefile\");\n \terrno = ENOENT;\n-\tsha1_file_directory = getenv(DB_ENVIRONMENT);\n-\tif (!sha1_file_directory)\n-\t\tsha1_file_directory = DEFAULT_DB_ENVIRONMENT;\n+\tsha1_file_directory = get_object_directory();\n \tif (access(sha1_file_directory, X_OK) < 0)\n \t\treturn error(\"no access to SHA1 file directory\");\n \tfd = open(get_index_file(), O_RDONLY);\nIndex: sha1_file.c\n===================================================================\n--- 31e9af73983d640090508b06784ef7db4816c957/sha1_file.c  (mode:100644 sha1:97a515a073fec5870dfaaa279868ce9330853d3d)\n+++ bec1c4178131a67de1fa639a274b13adec21c1e5/sha1_file.c  (mode:100644 sha1:94ab1119383a00a821254c3454fe349845027346)\n@@ -71,8 +71,11 @@ char *sha1_file_name(const unsigned char\n \tstatic char *name, *base;\n \n \tif (!base) {\n-\t\tchar *sha1_file_directory = getenv(DB_ENVIRONMENT) ? : DEFAULT_DB_ENVIRONMENT;\n-\t\tint len = strlen(sha1_file_directory);\n+\t\tint len;\n+\n+\t\tif (!sha1_file_directory)\n+\t\t\tsha1_file_directory = get_object_directory();\n+\t\tlen = strlen(sha1_file_directory);\n \t\tbase = malloc(len + 60);\n \t\tmemcpy(base, sha1_file_directory, len);\n \t\tmemset(base+len, 0, 60);\n\n-- \nJonas Fonseca\n"}]}