security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

wks: Create sub-directories

Browse Source 
* tools/wks-util.c (wks_compute_hu_fname): Stat and create directory
if needed.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2018-12-04 11:37:54 +01:00
parent 602b190963
commit 73e5b0ec9b
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/wks-util.c
View File

@ -19,6 +19,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include "../common/util.h" #include "../common/util.h"
#include "../common/status.h" #include "../common/status.h"
@ -811,6 +813,8 @@ wks_compute_hu_fname (char **r_fname, const char *addrspec)
char *hash; char *hash;
const char *domain; const char *domain;
char sha1buf[20]; char sha1buf[20];
char *fname;
struct stat sb;
*r_fname = NULL; *r_fname = NULL;
@ -824,12 +828,28 @@ wks_compute_hu_fname (char **r_fname, const char *addrspec)
if (!hash) if (!hash)
return gpg_error_from_syserror (); return gpg_error_from_syserror ();
*r_fname = make_filename_try (opt.directory, domain, "hu", hash, NULL); /* Try to create missing directories below opt.directory. */
if (!*r_fname) fname = make_filename_try (opt.directory, domain, NULL);
err = gpg_error_from_syserror (); if (fname && stat (fname, &sb)
else && gpg_err_code_from_syserror () == GPG_ERR_ENOENT)
err = 0; if (!gnupg_mkdir (fname, "-rwxr--r--") && opt.verbose)
log_info ("directory '%s' created\n", fname);
xfree (fname);
fname = make_filename_try (opt.directory, domain, "hu", NULL);
if (fname && stat (fname, &sb)
&& gpg_err_code_from_syserror () == GPG_ERR_ENOENT)
if (!gnupg_mkdir (fname, "-rwxr--r--") && opt.verbose)
log_info ("directory '%s' created\n", fname);
xfree (fname);
/* Create the filename. */
fname = make_filename_try (opt.directory, domain, "hu", hash, NULL);
err = fname? 0 : gpg_error_from_syserror ();
if (err)
xfree (fname);
else
*r_fname = fname; /* Okay. */
xfree (hash); xfree (hash);
return err; return err;
} }