From eef5a1df9e26e33805246877e1a0c20b86f48510 Mon Sep 17 00:00:00 2001 From: Todd Fries Date: Wed, 19 Jan 2011 00:22:57 +0000 Subject: refactor mkdir() into create_mkdir(), many -'s included awesome! marco@ --- xxxterm.c | 106 +++++++++++++++++++------------------------------------------- 1 file changed, 33 insertions(+), 73 deletions(-) (limited to 'xxxterm.c') diff --git a/xxxterm.c b/xxxterm.c index 1e0b1ed..6ac6269 100644 --- a/xxxterm.c +++ b/xxxterm.c @@ -6560,6 +6560,30 @@ done: return (-1); } +void +create_dir(char **pathptr, int size, const char *dirname, const char *name) +{ + struct stat sb; + char *path = pathptr; + + if (path[0] == '\0') + snprintf(path, size, "%s/%s", pwd->pw_dir, + XT_DIR); + if (stat(path, &sb)) { + if (mkdir(path, S_IRWXU) == -1) + err(1, "mkdir %s(%s)", name, path); + if (stat(path, &sb)) + err(1, "stat %s(%s)", name, path); + } + if (S_ISDIR(sb.st_mode) == 0) + errx(1, "%s(%s) not a dir", name, path); + if (((sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO))) != S_IRWXU) { + warnx("fixing invalid permissions on %s(%s)", name, path); + if (chmod(path, S_IRWXU) == -1) + err(1, "chmod"); + } +} + void usage(void) { @@ -6654,91 +6678,27 @@ main(int argc, char *argv[]) config_parse(conf, 0); /* working directory */ - snprintf(work_dir, sizeof work_dir, "%s/%s", pwd->pw_dir, XT_DIR); - if (stat(work_dir, &sb)) { - if (mkdir(work_dir, S_IRWXU) == -1) - err(1, "mkdir work_dir"); - if (stat(work_dir, &sb)) - err(1, "stat work_dir"); - } - if (S_ISDIR(sb.st_mode) == 0) - errx(1, "%s not a dir", work_dir); - if (((sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO))) != S_IRWXU) { - warnx("fixing invalid permissions on %s", work_dir); - if (chmod(work_dir, S_IRWXU) == -1) - err(1, "chmod"); - } + create_dir(&work_dir, sizeof work_dir, XT_DIR, "work_dir"); /* icon cache dir */ - snprintf(cache_dir, sizeof cache_dir, "%s/%s/%s", - pwd->pw_dir, XT_DIR, XT_CACHE_DIR); - if (stat(cache_dir, &sb)) { - if (mkdir(cache_dir, S_IRWXU) == -1) - err(1, "mkdir cache_dir"); - if (stat(cache_dir, &sb)) - err(1, "stat cache_dir"); - } - if (S_ISDIR(sb.st_mode) == 0) - errx(1, "%s not a dir", cache_dir); - if (((sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO))) != S_IRWXU) { - warnx("fixing invalid permissions on %s", cache_dir); - if (chmod(cache_dir, S_IRWXU) == -1) - err(1, "chmod"); - } + create_dir(&cache_dir, sizeof cache_dir, XT_CACHE_DIR, "cache_dir"); /* certs dir */ - snprintf(certs_dir, sizeof certs_dir, "%s/%s/%s", - pwd->pw_dir, XT_DIR, XT_CERT_DIR); - if (stat(certs_dir, &sb)) { - if (mkdir(certs_dir, S_IRWXU) == -1) - err(1, "mkdir certs_dir"); - if (stat(certs_dir, &sb)) - err(1, "stat certs_dir"); - } - if (S_ISDIR(sb.st_mode) == 0) - errx(1, "%s not a dir", certs_dir); - if (((sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO))) != S_IRWXU) { - warnx("fixing invalid permissions on %s", certs_dir); - if (chmod(certs_dir, S_IRWXU) == -1) - err(1, "chmod"); - } + create_dir(&certs_dir, sizeof certs_dir, XT_CERT_DIR, "certs_dir"); /* sessions dir */ - snprintf(sessions_dir, sizeof sessions_dir, "%s/%s/%s", - pwd->pw_dir, XT_DIR, XT_SESSIONS_DIR); - if (stat(sessions_dir, &sb)) { - if (mkdir(sessions_dir, S_IRWXU) == -1) - err(1, "mkdir sessions_dir"); - if (stat(sessions_dir, &sb)) - err(1, "stat sessions_dir"); - } - if (S_ISDIR(sb.st_mode) == 0) - errx(1, "%s not a dir", sessions_dir); - if (((sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO))) != S_IRWXU) { - warnx("fixing invalid permissions on %s", sessions_dir); - if (chmod(sessions_dir, S_IRWXU) == -1) - err(1, "chmod"); - } + create_dir(&sessions_dir, sizeof sessions_dir, XT_SESSIONS_DIR, + "sessions_dir"); + /* runtime settings that can override config file */ if (runtime_settings[0] != '\0') config_parse(runtime_settings, 1); /* download dir */ if (!strcmp(download_dir, pwd->pw_dir)) - strlcat(download_dir, "/downloads", sizeof download_dir); - if (stat(download_dir, &sb)) { - if (mkdir(download_dir, S_IRWXU) == -1) - err(1, "mkdir download_dir"); - if (stat(download_dir, &sb)) - err(1, "stat download_dir"); - } - if (S_ISDIR(sb.st_mode) == 0) - errx(1, "%s not a dir", download_dir); - if (((sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO))) != S_IRWXU) { - warnx("fixing invalid permissions on %s", download_dir); - if (chmod(download_dir, S_IRWXU) == -1) - err(1, "chmod"); - } + download_dir[0] = '\0'; + create_dir(&download_dir, sizeof download_dir, "downloads", + "download_dir"); /* favorites file */ snprintf(file, sizeof file, "%s/%s", work_dir, XT_FAVS_FILE); -- cgit 1.4.1-2-gfad0 id='n47' href='#n47'>47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204