X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhstoresbr.c;h=5776ef357859f4e492e87ae0b275303e5219aa37;hb=08aa8c17c3241bb5c6a997ed2e01e25a4d0089ce;hp=519e4810e1eb808c851e552dae0fa4f42f4f8f23;hpb=1513f7668c494c4583141d6115669b7198c14556;p=mmh diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c index 519e481..5776ef3 100644 --- a/uip/mhstoresbr.c +++ b/uip/mhstoresbr.c @@ -75,7 +75,6 @@ static int store_external (CT); static int ct_compar (CT *, CT *); static int store_content (CT, CT); static int output_content_file (CT, int); -static int check_folder (char *); static int output_content_folder (char *, char *); static int parse_format_string (CT, char *, char *, int, char *); static void get_storeproc (CT); @@ -571,8 +570,7 @@ store_content (CT ct, CT p) folder = getfolder (1); /* Check if folder exists */ - if (check_folder (folder) == NOTOK) - return NOTOK; + create_folder(folder, 0, exit); /* Record the folder name */ ct->c_folder = add (folder, NULL); @@ -864,47 +862,6 @@ losing: /* - * Check if folder exists, and create - * if necessary. - */ - -static int -check_folder (char *folder) -{ - char *folderdir; - struct stat st; - - /* expand path to the folder */ - folderdir = m_mailpath (folder); - - /* Check if folder exists */ - if (stat (folderdir, &st) == NOTOK) { - int answer; - char *ep; - - if (errno != ENOENT) { - advise (folderdir, "error on folder"); - return NOTOK; - } - - ep = concat ("Create folder \"", folderdir, "\"? ", NULL); - answer = getanswer (ep); - free (ep); - - if (!answer) - return NOTOK; - - if (!makedir (folderdir)) { - advise (NULL, "unable to create folder %s", folderdir); - return NOTOK; - } - } - - return OK; -} - - -/* * Add a file to a folder. * * Return the new message number of the file