comparison: src/util.c
src/util.c
- changeset 7632
- c81dccce23ed
- parent 7631
- 0e9e516bb6c3
- child 7633
- 653fd7bd7e20
equal
deleted
inserted
replaced
| 7631:0e9e516bb6c3 | 7632:c81dccce23ed |
|---|---|
| 1187 return NULL; | 1187 return NULL; |
| 1188 } | 1188 } |
| 1189 | 1189 |
| 1190 int gaim_build_dir (const char *path, int mode) | 1190 int gaim_build_dir (const char *path, int mode) |
| 1191 { | 1191 { |
| 1192 struct stat st; | |
| 1193 char *dir, **components, delim[] = { G_DIR_SEPARATOR, '\0' }; | 1192 char *dir, **components, delim[] = { G_DIR_SEPARATOR, '\0' }; |
| 1194 int cur, len; | 1193 int cur, len; |
| 1195 | 1194 |
| 1196 if (path == NULL || path[0] != G_DIR_SEPARATOR) | 1195 g_return_val_if_fail(path != NULL, -1); |
| 1197 return -1; | |
| 1198 | 1196 |
| 1199 dir = g_new0(char, strlen(path) + 1); | 1197 dir = g_new0(char, strlen(path) + 1); |
| 1200 components = g_strsplit(path, delim, -1); | 1198 components = g_strsplit(path, delim, -1); |
| 1201 len = 0; | 1199 len = 0; |
| 1202 for (cur = 0; components[cur] != NULL; cur++) { | 1200 for (cur = 0; components[cur] != NULL; cur++) { |
| 1203 if(*components[cur] == '\0') | |
| 1204 continue; | |
| 1205 if(cur != 0) | |
| 1206 dir[len++] = G_DIR_SEPARATOR; | |
| 1207 strcpy(dir + len, components[cur]); | 1201 strcpy(dir + len, components[cur]); |
| 1208 len += strlen(components[cur]); | 1202 len += strlen(components[cur]); |
| 1209 if (stat(dir, &st) == 0) { | 1203 dir[len++] = G_DIR_SEPARATOR; |
| 1210 if ((st.st_mode & S_IFMT) == S_IFDIR) | 1204 |
| 1211 continue; | 1205 if(g_file_test(dir, G_FILE_TEST_IS_DIR)) { |
| 1212 else { | 1206 continue; |
| 1213 gaim_debug(GAIM_DEBUG_WARNING, "build_dir", "bad path: %s\n", path); | 1207 } else if(g_file_test(dir, G_FILE_TEST_EXISTS)) { |
| 1214 g_strfreev(components); | 1208 gaim_debug(GAIM_DEBUG_WARNING, "build_dir", "bad path: %s\n", path); |
| 1215 g_free(dir); | |
| 1216 return -1; | |
| 1217 } | |
| 1218 } else if (errno != ENOENT) { | |
| 1219 gaim_debug(GAIM_DEBUG_WARNING, "build_dir", "stat: %s\n", strerror(errno)); | |
| 1220 g_strfreev(components); | 1209 g_strfreev(components); |
| 1221 g_free(dir); | 1210 g_free(dir); |
| 1222 return -1; | 1211 return -1; |
| 1223 } | 1212 } |
| 1224 | 1213 |
