koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

introduce sasprintf() in libi3, use it everywhere

Browse Source
This commit is contained in:
Michael Stapelberg
2011-10-23 13:16:56 +01:00
parent 14abafb3c8
commit 9d15a00ba8
18 changed files with 68 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/util.c
View File

@ -85,7 +85,7 @@ void exec_i3_utility(char *name, char *argv[]) {
* argv[0]’s dirname */
char *pathbuf = strdup(start_argv[0]);
char *dir = dirname(pathbuf);
asprintf(&migratepath, "%s/%s", dir, name);
sasprintf(&migratepath, "%s/%s", dir, name);
argv[0] = migratepath;
execvp(migratepath, argv);
@ -97,7 +97,7 @@ void exec_i3_utility(char *name, char *argv[]) {
exit(1);
}
dir = dirname(buffer);
asprintf(&migratepath, "%s/%s", dir, name);
sasprintf(&migratepath, "%s/%s", dir, name);
argv[0] = migratepath;
execvp(migratepath, argv);
#endif
@ -237,16 +237,10 @@ char *get_process_filename(const char *prefix) {
if (dir == NULL) {
struct passwd *pw = getpwuid(getuid());
const char *username = pw ? pw->pw_name : "unknown";
if (asprintf(&dir, "/tmp/i3-%s", username) == -1) {
perror("asprintf()");
return NULL;
}
sasprintf(&dir, "/tmp/i3-%s", username);
} else {
char *tmp;
if (asprintf(&tmp, "%s/i3", dir) == -1) {
perror("asprintf()");
return NULL;
}
sasprintf(&tmp, "%s/i3", dir);
dir = tmp;
}
if (!path_exists(dir)) {
@ -256,11 +250,7 @@ char *get_process_filename(const char *prefix) {
}
}
char *filename;
if (asprintf(&filename, "%s/%s.%d", dir, prefix, getpid()) == -1) {
perror("asprintf()");
filename = NULL;
}
sasprintf(&filename, "%s/%s.%d", dir, prefix, getpid());
free(dir);
return filename;
}