lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't barf at directories with none of {tmp,new,cur}/ and turn them

Browse Source 
into maildirs instead. see next commit.
This commit is contained in:
Oswald Buddenhagen 2006-02-11 20:14:31 +00:00
parent 5224b5bc9f
commit 7726ce3e0f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/drv_maildir.c
View File

@ -212,7 +212,7 @@ maildir_validate( const char *prefix, const char *box, int create )
DIR *dirp; DIR *dirp;
struct dirent *entry; struct dirent *entry;
time_t now; time_t now;
int i, bl; int i, j, bl;
struct stat st; struct stat st;
char buf[_POSIX_PATH_MAX]; char buf[_POSIX_PATH_MAX];
@ -225,6 +225,7 @@ maildir_validate( const char *prefix, const char *box, int create )
buf, strerror(errno), errno ); buf, strerror(errno), errno );
return DRV_STORE_BAD; return DRV_STORE_BAD;
} }
mkdirs:
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
memcpy( buf + bl, subdirs[i], 4 ); memcpy( buf + bl, subdirs[i], 4 );
if (mkdir( buf, 0700 )) { if (mkdir( buf, 0700 )) {
@ -243,12 +244,16 @@ maildir_validate( const char *prefix, const char *box, int create )
return DRV_BOX_BAD; return DRV_BOX_BAD;
} }
} else { } else {
for (i = 0; i < 3; i++) { for (i = j = 0; i < 3; i++) {
memcpy( buf + bl, subdirs[i], 4 ); memcpy( buf + bl, subdirs[i], 4 );
if (stat( buf, &st ) || !S_ISDIR(st.st_mode)) { if (!stat( buf, &st ) && S_ISDIR(st.st_mode))
fprintf( stderr, "Maildir error: '%.*s' is no valid mailbox\n", bl, buf ); j++;
return DRV_BOX_BAD; }
} if (!j)
goto mkdirs;
if (j != 3) {
fprintf( stderr, "Maildir error: '%.*s' is no valid mailbox\n", bl, buf );
return DRV_BOX_BAD;
} }
memcpy( buf + bl, "tmp/", 5 ); memcpy( buf + bl, "tmp/", 5 );
bl += 4; bl += 4;