X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fdirectory.c;h=7f4b44eb1e66254aeded9af2d2ad2b169d15db53;hb=63d8899d3bce4722a014f4566cbc9cde82e10225;hp=3843493acb23351b4d74063d1540c1c7ce918a01;hpb=6b814c857d98259bd82737ce8746c6c1d94e9cd5;p=netatalk.git diff --git a/etc/afpd/directory.c b/etc/afpd/directory.c index 3843493a..7f4b44eb 100644 --- a/etc/afpd/directory.c +++ b/etc/afpd/directory.c @@ -1,5 +1,5 @@ /* - * $Id: directory.c,v 1.42 2002-10-11 14:18:27 didg Exp $ + * $Id: directory.c,v 1.64 2003-03-15 01:34:35 didg Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -60,6 +60,7 @@ char *strchr (), *strrchr (); #include "unix.h" struct dir *curdir; +int afp_errno; #define SENTINEL (&sentinel) static struct dir sentinel = { SENTINEL, SENTINEL, NULL, DIRTREE_COLOR_BLACK, @@ -99,9 +100,10 @@ u_int32_t did; /* check for 0 did */ - if (!did) + if (!did) { + afp_errno = AFPERR_PARAM; return NULL; - + } if ( did == DIRDID_ROOT_PARENT ) { if (!rootpar.d_did) rootpar.d_did = DIRDID_ROOT_PARENT; @@ -110,6 +112,7 @@ u_int32_t did; } dir = vol->v_root; + afp_errno = AFPERR_NOOBJ; while ( dir != SENTINEL ) { if (dir->d_did == did) return dir->d_m_name ? dir : NULL; @@ -118,6 +121,43 @@ u_int32_t did; return NULL; } +/* ------------------- */ +#ifdef ATACC +int path_isadir(struct path *o_path) +{ + return o_path->m_name == '\0' || /* we are in a it */ + !o_path->st_valid || /* in cache but we can't chdir in it */ + (!o_path->st_errno && S_ISDIR(o_path->st.st_mode)); /* not in cache an can't chdir */ +} +#endif + +int get_afp_errno(const int param) +{ + if (afp_errno != AFPERR_DID1) + return afp_errno; + return param; +} + +/* ------------------- */ +struct dir * + dirsearch_byname( cdir, name ) + struct dir *cdir; + const char *name; +{ +struct dir *dir; + + if (!strcmp(name, ".")) + return cdir; + dir = cdir->d_child; + while (dir) { + if ( strcmp( dir->d_u_name, name ) == 0 ) { + break; + } + dir = (dir == curdir->d_child->d_prev) ? NULL : dir->d_next; + } + return dir; +} + /* ----------------------------------------- * if did is not in the cache resolve it with cnid * @@ -140,15 +180,19 @@ u_int32_t did; char *mpath; ret = dirsearch(vol, did); - if (ret != NULL) + if (ret != NULL || afp_errno == AFPERR_PARAM) return ret; id = did; - if ((upath = cnid_resolve(vol->v_db, &id, buffer, buflen)) == NULL) { + if (NULL == (upath = cnid_resolve(vol->v_db, &id, buffer, buflen)) ) { + afp_errno = AFPERR_NOOBJ; return NULL; } ptr = path + MAXPATHLEN; - mpath = utompath(vol, upath); + if (NULL == ( mpath = utompath(vol, upath, utf8_encoding()) ) ) { + afp_errno = AFPERR_NOOBJ; + return NULL; + } len = strlen(mpath); pathlen = len; /* no 0 in the last part */ len++; @@ -159,13 +203,20 @@ u_int32_t did; if (ret != NULL) { break; } - if ((upath = cnid_resolve(vol->v_db, &id, buffer, buflen)) == NULL) + if ( NULL == (upath = cnid_resolve(vol->v_db, &id, buffer, buflen)) + || + NULL == (mpath = utompath(vol, upath, utf8_encoding())) + ) { + afp_errno = AFPERR_NOOBJ; return NULL; - mpath = utompath(vol, upath); + } + len = strlen(mpath) + 1; pathlen += len; - if (pathlen > 255) + if (pathlen > 255) { + afp_errno = AFPERR_PARAM; return NULL; + } strcpy(ptr - len, mpath); ptr -= len; } @@ -436,15 +487,15 @@ struct dir *dir; * process. It's fixable within afpd if fnctl_lock, doable with smb and * next to impossible for nfs and local filesystem access. */ - static void dir_invalidate( vol, dir ) const struct vol *vol; struct dir *dir; { if (curdir == dir) { /* v_root can't be deleted */ - if (movecwd(vol, vol->v_root) < 0) - printf("Yuup cant change dir to v_root\n"); + if (movecwd(vol, vol->v_root) < 0) { + LOG(log_error, logtype_afpd, "cname can't chdir to : %s", vol->v_root); + } } /* FIXME */ dirchildremove(dir->d_parent, dir); @@ -490,10 +541,13 @@ struct vol *vol; struct dir *dir; struct path *path; { - char *p; + path->u_name = mtoupath(vol, path->m_name, utf8_encoding() ); - path->u_name = p = mtoupath(vol, path->m_name ); - if ( of_stat( path ) != 0 ) { + if ( path->u_name == NULL) { + afp_errno = AFPERR_PARAM; + return NULL; + } + if (of_stat( path ) != 0 ) { return( NULL ); } @@ -512,6 +566,79 @@ struct path *path; return( dir ); } +/* ------------------- + system rmdir with afp error code. + ENOENT is not an error. + */ +static int netatalk_rmdir(const char *name) +{ + if (rmdir(name) < 0) { + switch ( errno ) { + case ENOENT : + break; + case ENOTEMPTY : + return AFPERR_DIRNEMPT; + case EPERM: + case EACCES : + return AFPERR_ACCESS; + case EROFS: + return AFPERR_VLOCK; + default : + return AFPERR_PARAM; + } + } + return AFP_OK; +} + +/* ------------------------- + appledouble mkdir afp error code. +*/ +static int netatalk_mkdir(const char *name) +{ + if (ad_mkdir(name, DIRBITS | 0777) < 0) { + switch ( errno ) { + case ENOENT : + return( AFPERR_NOOBJ ); + case EROFS : + return( AFPERR_VLOCK ); + case EPERM: + case EACCES : + return( AFPERR_ACCESS ); + case EEXIST : + return( AFPERR_EXIST ); + case ENOSPC : + case EDQUOT : + return( AFPERR_DFULL ); + default : + return( AFPERR_PARAM ); + } + } + return AFP_OK; +} + +/* ------------------- + system unlink with afp error code. + ENOENT is not an error. + */ +int netatalk_unlink(const char *name) +{ + if (unlink(name) < 0) { + switch (errno) { + case ENOENT : + break; + case EROFS: + return AFPERR_VLOCK; + case EPERM: + case EACCES : + return AFPERR_ACCESS; + default : + return AFPERR_PARAM; + } + } + return AFP_OK; +} + +/* ------------------- */ static int deletedir(char *dir) { char path[MAXPATHLEN + 1]; @@ -519,9 +646,10 @@ static int deletedir(char *dir) struct dirent *de; struct stat st; size_t len; - int err; + int err = AFP_OK; + size_t remain; - if ((len = strlen(dir)) > sizeof(path)) + if ((len = strlen(dir)) +2 > sizeof(path)) return AFPERR_PARAM; /* already gone */ @@ -531,57 +659,34 @@ static int deletedir(char *dir) strcpy(path, dir); strcat(path, "/"); len++; - while ((de = readdir(dp))) { + remain = sizeof(path) -len -1; + while ((de = readdir(dp)) && err == AFP_OK) { /* skip this and previous directory */ if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) continue; - strncpy(path + len, de->d_name, sizeof(path) - len); - if (stat(path, &st) == 0) { - if (S_ISDIR(st.st_mode)) { - if ((err = deletedir(path)) < 0) { - closedir(dp); - return err; - } - } else if (unlink(path) < 0) { - switch (errno) { - case ENOENT : - continue; /* somebody went and deleted it behind our backs. */ - case EROFS: - err = AFPERR_VLOCK; - break; - case EPERM: - case EACCES : - err = AFPERR_ACCESS; - break; - default : - err = AFPERR_PARAM; - } - closedir(dp); - return err; - } + if (strlen(de->d_name) > remain) { + err = AFPERR_PARAM; + break; + } + strcpy(path + len, de->d_name); + if (stat(path, &st)) { + continue; + } + if (S_ISDIR(st.st_mode)) { + err = deletedir(path); + } else { + err = netatalk_unlink(path); } } closedir(dp); /* okay. the directory is empty. delete it. note: we already got rid of .AppleDouble. */ - if (rmdir(dir) < 0) { - switch ( errno ) { - case ENOENT : - break; - case ENOTEMPTY : /* should never happen */ - return( AFPERR_DIRNEMPT ); - case EPERM: - case EACCES : - return( AFPERR_ACCESS ); - case EROFS: - return AFPERR_VLOCK; - default : - return( AFPERR_PARAM ); - } + if (err == AFP_OK) { + err = netatalk_rmdir(dir); } - return AFP_OK; + return err; } /* do a recursive copy. */ @@ -593,6 +698,8 @@ static int copydir(char *src, char *dst, int noadouble) struct stat st; struct utimbuf ut; size_t slen, dlen; + size_t srem, drem; + int err; /* doesn't exist or the path is too long. */ @@ -602,47 +709,45 @@ static int copydir(char *src, char *dst, int noadouble) return AFPERR_PARAM; /* try to create the destination directory */ - if (ad_mkdir(dst, DIRBITS | 0777) < 0) { + if (AFP_OK != (err = netatalk_mkdir(dst)) ) { closedir(dp); - switch ( errno ) { - case ENOENT : - return( AFPERR_NOOBJ ); - case EROFS : - return( AFPERR_VLOCK ); - case EPERM: - case EACCES : - return( AFPERR_ACCESS ); - case EEXIST : - return( AFPERR_EXIST ); - case ENOSPC : - case EDQUOT : - return( AFPERR_DFULL ); - default : - return( AFPERR_PARAM ); - } + return err; } /* set things up to copy */ strcpy(spath, src); strcat(spath, "/"); slen++; + srem = sizeof(spath) - slen -1; + strcpy(dpath, dst); strcat(dpath, "/"); dlen++; + drem = sizeof(dpath) - dlen -1; + err = AFP_OK; while ((de = readdir(dp))) { /* skip this and previous directory */ if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) continue; - strncpy(spath + slen, de->d_name, sizeof(spath) - slen); + if (strlen(de->d_name) > srem) { + err = AFPERR_PARAM; + break; + } + strcpy(spath + slen, de->d_name); + if (stat(spath, &st) == 0) { - strncpy(dpath + dlen, de->d_name, sizeof(dpath) - dlen); + if (strlen(de->d_name) > drem) { + err = AFPERR_PARAM; + break; + } + strcpy(dpath + dlen, de->d_name); if (S_ISDIR(st.st_mode)) { - if ((err = copydir(spath, dpath, noadouble)) < 0) + if (AFP_OK != (err = copydir(spath, dpath, noadouble))) goto copydir_done; - } else if ((err = copyfile(spath, dpath, NULL, noadouble)) < 0) { + } else if (AFP_OK != (err = copyfile(spath, dpath, NULL, noadouble))) { goto copydir_done; } else { @@ -728,6 +833,14 @@ struct dir *dir; /* free everything down. we don't bother to recolor as this is only * called to free the entire tree */ +void dirfreename(struct dir *dir) +{ + if (dir->d_u_name != dir->d_m_name) { + free(dir->d_u_name); + } + free(dir->d_m_name); +} + void dirfree( dir ) struct dir *dir; { @@ -742,10 +855,7 @@ struct dir *dir; } if (dir != SENTINEL) { - if (dir->d_u_name != dir->d_m_name) { - free(dir->d_u_name); - } - free(dir->d_m_name); + dirfreename(dir); free( dir ); } } @@ -781,24 +891,37 @@ struct dir *dirnew(const char *m_name, const char *u_name) } /* -------------------------------------------------- */ -/* XXX: this needs to be changed to handle path types +/* cname return if it's a filename: in extenddir: compute unix name - stat the file - return mac name + stat the file or errno + return + filename + curdir: filename parent directory + if it's a dirname: not in the cache in extenddir compute unix name - stat the dir + stat the dir or errno + return + if chdir error + dirname + curdir: dir parent directory + sinon + dirname: "" + curdir: dir in the cache - - u_name can be - XXXX u_name can be an alias on m_name if the m_name is - a valid unix name. - + return + if chdir error + dirname + curdir: dir parent directory + else + dirname: "" + curdir: dir + */ struct path * cname( vol, dir, cpath ) @@ -811,65 +934,80 @@ char **cpath; static struct path ret; char *data, *p; - char *u; int extend = 0; int len; - int olen = 0; - + u_int32_t hint; + u_int16_t len16; + int size = 0; + char sep; + data = *cpath; - if ( *data++ != 2 ) { /* path type */ + afp_errno = AFPERR_NOOBJ; + switch (ret.m_type = *data) { /* path type */ + case 2: + data++; + len = (unsigned char) *data++; + size = 2; + sep = 0; + break; + case 3: + if (afp_version >= 30) { + data++; + memcpy(&hint, data, sizeof(hint)); + hint = ntohl(hint); + data += sizeof(hint); + + memcpy(&len16, data, sizeof(len16)); + len = ntohs(len16); + data += 2; + size = 7; + sep = 0; /* '/';*/ + break; + } + /* else it's an error */ + default: + afp_errno = AFPERR_PARAM; return( NULL ); + } - len = (unsigned char) *data++; - *cpath += len + 2; + *cpath += len + size; *path = '\0'; - u = NULL; ret.m_name = path; ret.st_errno = 0; ret.st_valid = 0; for ( ;; ) { if ( len == 0 ) { - if ( !extend && movecwd( vol, dir ) < 0 ) { + if (movecwd( vol, dir ) < 0 ) { /* it's tricky: - movecwd failed so dir is not there anymore. + movecwd failed some of dir path are not there anymore. FIXME Is it true with other errors? - if path == '\0' ==> the cpath parameter is that dir, - and maybe we are trying to recreate it! So we can't - fail here. - + so we remove dir from the cache */ - if ( dir->d_did == DIRDID_ROOT_PARENT) - return NULL; - cdir = dir->d_parent; - dir_invalidate(vol, dir); - if (*path != '\0' || u == NULL) { - /* FIXME: if path != '\0' then extend != 0 ? - * u == NUL ==> cpath is something like: - * toto\0\0\0 - */ - return NULL; - } - if (movecwd(vol, cdir) < 0) { - printf("can't change to parent\n"); - return NULL; /* give up the whole tree is out of synch*/ + if (dir->d_did == DIRDID_ROOT_PARENT) + return NULL; + if (afp_errno == AFPERR_ACCESS) { + if ( movecwd( vol, dir->d_parent ) < 0 ) { + return NULL; + } + ret.m_name = dir->d_m_name; + ret.u_name = dir->d_u_name; + return &ret; } - /* restore the previous token */ - strncpy(path, u, olen); - path[olen] = '\0'; + + dir_invalidate(vol, dir); + return NULL; } - if (!ret.st_valid || *path == '\0') { + if (*path == '\0') { ret.u_name = "."; } return &ret; } - if ( *data == '\0' ) { + if (*data == sep ) { data++; len--; } - u = NULL; - - while ( *data == '\0' && len > 0 ) { + while (*data == sep && len > 0 ) { if ( dir->d_parent == NULL ) { return NULL; } @@ -880,11 +1018,7 @@ char **cpath; /* would this be faster with strlen + strncpy? */ p = path; - if (len > 0) { - u = data; - olen = len; - } - while ( *data != '\0' && len > 0 ) { + while ( *data != sep && len > 0 ) { *p++ = *data++; len--; } @@ -901,7 +1035,7 @@ char **cpath; if ( !extend ) { cdir = dir->d_child; while (cdir) { - if ( strcasecmp( cdir->d_m_name, path ) == 0 ) { + if ( strcmp( cdir->d_m_name, path ) == 0 ) { break; } cdir = (cdir == dir->d_child->d_prev) ? NULL : @@ -917,6 +1051,12 @@ char **cpath; /* dir is not valid anymore we delete dir from the cache and abort. */ + if ( dir->d_did == DIRDID_ROOT_PARENT) { + afp_errno = AFPERR_NOOBJ; + return NULL; + } + if (afp_errno == AFPERR_ACCESS) + return NULL; dir_invalidate(vol, dir); return NULL; } @@ -928,7 +1068,8 @@ char **cpath; } if ( cdir == NULL ) { - if ( len > 0 ) { + + if ( len > 0 || !ret.u_name) { return NULL; } @@ -956,6 +1097,7 @@ struct dir *dir; return( 0 ); } if ( dir->d_did == DIRDID_ROOT_PARENT) { + afp_errno = AFPERR_DID1; /* AFPERR_PARAM;*/ return( -1 ); } @@ -963,19 +1105,36 @@ struct dir *dir; *p-- = '\0'; *p = '.'; for ( d = dir; d->d_parent != NULL && d != curdir; d = d->d_parent ) { - *--p = '/'; u = d->d_u_name; n = strlen( u ); + if (p -n -1 < path) { + afp_errno = AFPERR_PARAM; + return -1; + } + *--p = '/'; p -= n; strncpy( p, u, n ); } if ( d != curdir ) { - *--p = '/'; n = strlen( vol->v_path ); + if (p -n -1 < path) { + afp_errno = AFPERR_PARAM; + return -1; + } + *--p = '/'; p -= n; strncpy( p, vol->v_path, n ); } if ( chdir( p ) < 0 ) { + switch (errno) { + case EACCES: + case EPERM: + afp_errno = AFPERR_ACCESS; + break; + default: + afp_errno = AFPERR_NOOBJ; + + } return( -1 ); } curdir = dir; @@ -1012,6 +1171,7 @@ char *p; (".", curdir) (name, dir) with curdir:name == dir, from afp_enumerate */ + int getdirparams(const struct vol *vol, u_int16_t bitmap, struct path *s_path, struct dir *dir, @@ -1019,11 +1179,12 @@ int getdirparams(const struct vol *vol, { struct maccess ma; struct adouble ad; - char *data, *nameoff = NULL; + char *data, *l_nameoff = NULL, *utf_nameoff = NULL; int bit = 0, isad = 0; u_int32_t aint; u_int16_t ashort; - int ret; + int ret; + u_int32_t utf8 = 0; struct stat *st = &s_path->st; char *upath = s_path->u_name; @@ -1114,7 +1275,7 @@ int getdirparams(const struct vol *vol, case DIRPBIT_LNAME : if (dir->d_m_name) /* root of parent can have a null name */ - nameoff = data; + l_nameoff = data; else memset(data, 0, sizeof(u_int16_t)); data += sizeof( u_int16_t ); @@ -1170,14 +1331,27 @@ int getdirparams(const struct vol *vol, /* Client has requested the ProDOS information block. Just pass back the same basic block for all directories. */ - case DIRPBIT_PDINFO : /* ProDOS Info Block */ - *data++ = 0x0f; - *data++ = 0; - ashort = htons( 0x0200 ); - memcpy( data, &ashort, sizeof( ashort )); - data += sizeof( ashort ); - memset( data, 0, sizeof( ashort )); - data += sizeof( ashort ); + case DIRPBIT_PDINFO : + if (afp_version >= 30) { /* UTF8 name */ + utf8 = kTextEncodingUTF8; + if (dir->d_m_name) /* root of parent can have a null name */ + utf_nameoff = data; + else + memset(data, 0, sizeof(u_int16_t)); + data += sizeof( u_int16_t ); + aint = 0; + memcpy(data, &aint, sizeof( aint )); + data += sizeof( aint ); + } + else { /* ProDOS Info Block */ + *data++ = 0x0f; + *data++ = 0; + ashort = htons( 0x0200 ); + memcpy( data, &ashort, sizeof( ashort )); + data += sizeof( ashort ); + memset( data, 0, sizeof( ashort )); + data += sizeof( ashort ); + } break; default : @@ -1189,16 +1363,15 @@ int getdirparams(const struct vol *vol, bitmap = bitmap>>1; bit++; } - if ( nameoff ) { + if ( l_nameoff ) { ashort = htons( data - buf ); - memcpy( nameoff, &ashort, sizeof( ashort )); - - if ((aint = strlen( dir->d_m_name )) > MACFILELEN) - aint = MACFILELEN; - - *data++ = aint; - memcpy( data, dir->d_m_name, aint ); - data += aint; + memcpy( l_nameoff, &ashort, sizeof( ashort )); + data = set_name(vol, data, dir->d_m_name, 0); + } + if ( utf_nameoff ) { + ashort = htons( data - buf ); + memcpy( utf_nameoff, &ashort, sizeof( ashort )); + data = set_name(vol, data, dir->d_m_name, utf8); } if ( isad ) { ad_close( &ad, ADFLAGS_HF ); @@ -1225,7 +1398,7 @@ int ibuflen, *rbuflen; memcpy( &vid, ibuf, sizeof( vid )); ibuf += sizeof( vid ); - if (( vol = getvolbyvid( vid )) == NULL ) { + if (NULL == ( vol = getvolbyvid( vid )) ) { return( AFPERR_PARAM ); } @@ -1235,20 +1408,21 @@ int ibuflen, *rbuflen; memcpy( &did, ibuf, sizeof( did )); ibuf += sizeof( int ); - if (( dir = dirlookup( vol, did )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( dir = dirlookup( vol, did )) ) { + return afp_errno; } memcpy( &bitmap, ibuf, sizeof( bitmap )); bitmap = ntohs( bitmap ); ibuf += sizeof( bitmap ); - if (( path = cname( vol, dir, &ibuf )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( path = cname( vol, dir, &ibuf )) ) { + return get_afp_errno(AFPERR_NOOBJ); } + /* FIXME access error or not a file */ if ( *path->m_name != '\0' ) { - return( AFPERR_BADTYPE ); /* not a directory */ + return (path_isadir( path))? afp_errno:AFPERR_BADTYPE ; } /* @@ -1258,7 +1432,7 @@ int ibuflen, *rbuflen; ibuf++; } - if (( rc = setdirparams(vol, path, bitmap, ibuf )) == AFP_OK ) { + if (AFP_OK == ( rc = setdirparams(vol, path, bitmap, ibuf )) ) { setvoltime(obj, vol ); } return( rc ); @@ -1271,6 +1445,7 @@ int ibuflen, *rbuflen; */ struct path Cur_Path = { + 0, "", /* mac name */ ".", /* unix name */ 0, /* stat is not set */ @@ -1318,7 +1493,7 @@ int setdirparams(const struct vol *vol, * Check to see if a create was necessary. If it was, we'll want * to set our name, etc. */ - if ( ad_getoflags( &ad, ADFLAGS_HF ) & O_CREAT ) { + if ( ad_get_HF_flags( &ad ) & O_CREAT ) { ad_setentrylen( &ad, ADEID_NAME, strlen( curdir->d_m_name )); memcpy( ad_entry( &ad, ADEID_NAME ), curdir->d_m_name, ad_getentrylen( &ad, ADEID_NAME )); @@ -1535,9 +1710,10 @@ int setdirparams(const struct vol *vol, ProDOS information block. Skip over the data and report nothing amiss. */ case DIRPBIT_PDINFO : - buf += 6; - break; - + if (afp_version < 30) { + buf += 6; + break; + } default : err = AFPERR_BITMAP; goto setdirparam_done; @@ -1589,13 +1765,14 @@ int ibuflen, *rbuflen; struct path *s_path; u_int32_t did; u_int16_t vid; - + int err; + *rbuflen = 0; ibuf += 2; memcpy( &vid, ibuf, sizeof( vid )); ibuf += sizeof( vid ); - if (( vol = getvolbyvid( vid )) == NULL ) { + if (NULL == ( vol = getvolbyvid( vid )) ) { return( AFPERR_PARAM ); } @@ -1604,53 +1781,30 @@ int ibuflen, *rbuflen; memcpy( &did, ibuf, sizeof( did )); ibuf += sizeof( did ); - if (( dir = dirlookup( vol, did )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( dir = dirlookup( vol, did )) ) { + return afp_errno; /* was AFPERR_NOOBJ */ } - if (( s_path = cname( vol, dir, &ibuf )) == NULL ) { - switch( errno ) { - case EACCES: - return( AFPERR_ACCESS ); - case EEXIST: /* FIXME this one is impossible? */ - return( AFPERR_EXIST ); - default: - return( AFPERR_NOOBJ ); - } + if (NULL == ( s_path = cname( vol, dir, &ibuf )) ) { + return get_afp_errno(AFPERR_PARAM); } - /* FIXME check done elswhere? cname was able to move curdir to it! */ + /* cname was able to move curdir to it! */ if (*s_path->m_name == '\0') return AFPERR_EXIST; upath = s_path->u_name; - { - int ret; - if (0 != (ret = check_name(vol, upath))) { - return ret; - } + if (0 != (err = check_name(vol, upath))) { + return err; } - if ( ad_mkdir( upath, DIRBITS | 0777 ) < 0 ) { - switch ( errno ) { - case ENOENT : - return( AFPERR_NOOBJ ); - case EROFS : - return( AFPERR_VLOCK ); - case EACCES : - return( AFPERR_ACCESS ); - case EEXIST : - return( AFPERR_EXIST ); - case ENOSPC : - case EDQUOT : - return( AFPERR_DFULL ); - default : - return( AFPERR_PARAM ); - } + if (AFP_OK != (err = netatalk_mkdir( upath))) { + return err; } if (of_stat(s_path) < 0) { return AFPERR_MISC; } + curdir->offcnt++; if ((dir = adddir( vol, curdir, s_path)) == NULL) { return AFPERR_MISC; } @@ -1660,7 +1814,7 @@ int ibuflen, *rbuflen; } memset(&ad, 0, sizeof(ad)); - if (ad_open( "", vol_noadouble(vol)|ADFLAGS_HF|ADFLAGS_DIR, + if (ad_open( ".", vol_noadouble(vol)|ADFLAGS_HF|ADFLAGS_DIR, O_RDWR|O_CREAT, 0666, &ad ) < 0) { if (vol_noadouble(vol)) goto createdir_done; @@ -1695,9 +1849,9 @@ const int noadouble; struct dir *parent; char *buf; int len, err; - + /* existence check moved to afp_moveandrename */ - if ( rename( src, dst ) < 0 ) { + if ( unix_rename( src, dst ) < 0 ) { switch ( errno ) { case ENOENT : return( AFPERR_NOOBJ ); @@ -1724,27 +1878,17 @@ const int noadouble; } memset(&ad, 0, sizeof(ad)); - if ( ad_open( dst, ADFLAGS_HF|ADFLAGS_DIR, O_RDWR, 0, &ad) < 0 ) { - switch ( errno ) { - case ENOENT : - if (noadouble) { - len = strlen(newname); - goto renamedir_done; - } - return( AFPERR_NOOBJ ); - case EACCES : - return( AFPERR_ACCESS ); - default : - return( AFPERR_PARAM ); - } - } len = strlen( newname ); - ad_setentrylen( &ad, ADEID_NAME, len ); - memcpy( ad_entry( &ad, ADEID_NAME ), newname, len ); - ad_flush( &ad, ADFLAGS_HF ); - ad_close( &ad, ADFLAGS_HF ); - -renamedir_done: + /* rename() succeeded so we need to update our tree even if we can't open + * .Parent + */ + if ( !ad_open( dst, ADFLAGS_HF|ADFLAGS_DIR, O_RDWR, 0, &ad)) { + ad_setentrylen( &ad, ADEID_NAME, len ); + memcpy( ad_entry( &ad, ADEID_NAME ), newname, len ); + ad_flush( &ad, ADFLAGS_HF ); + ad_close( &ad, ADFLAGS_HF ); + } + if (dir->d_m_name == dir->d_u_name) dir->d_u_name = NULL; @@ -1796,15 +1940,12 @@ int pathlen; DIR *dp; struct adouble ad; u_int16_t ashort; + int err; if ( curdir->d_parent == NULL ) { return( AFPERR_ACCESS ); } - if ( curdir->d_child != NULL ) { - return( AFPERR_DIRNEMPT ); - } - fdir = curdir; memset(&ad, 0, sizeof(ad)); @@ -1835,38 +1976,16 @@ int pathlen; } strcpy(path + DOT_APPLEDOUBLE_LEN, de->d_name); - if (unlink(path) < 0) { + if ((err = netatalk_unlink(path))) { closedir(dp); - switch (errno) { - case EPERM: - case EACCES : - return( AFPERR_ACCESS ); - case EROFS: - return AFPERR_VLOCK; - case ENOENT : - continue; - default : - return( AFPERR_PARAM ); - } + return err; } } closedir(dp); } - if ( rmdir( ".AppleDouble" ) < 0 ) { - switch ( errno ) { - case ENOENT : - break; - case ENOTEMPTY : - return( AFPERR_DIRNEMPT ); - case EROFS: - return AFPERR_VLOCK; - case EPERM: - case EACCES : - return( AFPERR_ACCESS ); - default : - return( AFPERR_PARAM ); - } + if ( (err = netatalk_rmdir( ".AppleDouble" )) ) { + return err; } /* now get rid of dangling symlinks */ @@ -1878,53 +1997,39 @@ int pathlen; /* bail if it's not a symlink */ if ((lstat(de->d_name, &st) == 0) && !S_ISLNK(st.st_mode)) { + closedir(dp); return AFPERR_DIRNEMPT; } - if (unlink(de->d_name) < 0) { - switch (errno) { - case EPERM: - case EACCES : - return( AFPERR_ACCESS ); - case EROFS: - return AFPERR_VLOCK; - case ENOENT : - continue; - default : - return( AFPERR_PARAM ); - } + if ((err = netatalk_unlink(de->d_name))) { + closedir(dp); + return err; } } - closedir(dp); } if ( movecwd( vol, curdir->d_parent ) < 0 ) { - return( AFPERR_NOOBJ ); - } - - if ( rmdir(fdir->d_u_name) < 0 ) { - switch ( errno ) { - case ENOENT : - return( AFPERR_NOOBJ ); - case ENOTEMPTY : - return( AFPERR_DIRNEMPT ); - case EPERM: - case EACCES : - return( AFPERR_ACCESS ); - case EROFS: - return AFPERR_VLOCK; - default : - return( AFPERR_PARAM ); - } + err = afp_errno; + goto delete_done; } - dirchildremove(curdir, fdir); + if ( !(err = netatalk_rmdir(fdir->d_u_name))) { + dirchildremove(curdir, fdir); #ifdef CNID_DB - cnid_delete(vol->v_db, fdir->d_did); + cnid_delete(vol->v_db, fdir->d_did); #endif /* CNID_DB */ - dir_remove( vol, fdir ); - - return( AFP_OK ); + dir_remove( vol, fdir ); + err = AFP_OK; + } +delete_done: + if (dp) { + /* inode is used as key for cnid. + * Close the descriptor only after cnid_delete + * has been called. + */ + closedir(dp); + } + return err; } int afp_mapid(obj, ibuf, ibuflen, rbuf, rbuflen ) @@ -1937,48 +2042,66 @@ int ibuflen, *rbuflen; char *name; u_int32_t id; int len, sfunc; - + int utf8 = 0; + ibuf++; sfunc = (unsigned char) *ibuf++; memcpy( &id, ibuf, sizeof( id )); id = ntohl(id); + *rbuflen = 0; if ( id != 0 ) { switch ( sfunc ) { case 1 : + case 3 :/* unicode */ if (( pw = getpwuid( id )) == NULL ) { - *rbuflen = 0; return( AFPERR_NOITEM ); } name = pw->pw_name; break; case 2 : + case 4 : /* unicode */ if (( gr = (struct group *)getgrgid( id )) == NULL ) { - *rbuflen = 0; return( AFPERR_NOITEM ); } name = gr->gr_name; break; default : - *rbuflen = 0; return( AFPERR_PARAM ); } - + switch ( sfunc ) { + case 3: + case 4: + if (afp_version < 30) { + return( AFPERR_PARAM ); + } + utf8 = 1; + /* map to unicode */ + break; + } len = strlen( name ); } else { len = 0; name = NULL; } - - *rbuf++ = len; + if (utf8) { + u_int16_t tp = htons(len); + memcpy(rbuf, &tp, sizeof(tp)); + rbuf += sizeof(tp); + *rbuflen += 2; + } + else { + *rbuf++ = len; + *rbuflen += 1; + } if ( len > 0 ) { memcpy( rbuf, name, len ); } - *rbuflen = len + 1; + *rbuflen += len; return( AFP_OK ); } @@ -1989,16 +2112,33 @@ int ibuflen, *rbuflen; { struct passwd *pw; struct group *gr; - int len, sfunc; - u_int32_t id; + int len, sfunc; + u_int32_t id; + u_int16_t ulen; ibuf++; sfunc = (unsigned char) *ibuf++; - len = (unsigned char) *ibuf++; + switch ( sfunc ) { + case 1 : + case 2 : /* unicode */ + memcpy(&ulen, ibuf, sizeof(ulen)); + len = ntohs(ulen); + ibuf += 2; + break; + case 3 : + case 4 : + len = (unsigned char) *ibuf++; + break; + default : + *rbuflen = 0; + return( AFPERR_PARAM ); + } + ibuf[ len ] = '\0'; if ( len != 0 ) { switch ( sfunc ) { + case 1 : /* unicode */ case 3 : if (( pw = (struct passwd *)getpwnam( ibuf )) == NULL ) { *rbuflen = 0; @@ -2007,6 +2147,7 @@ int ibuflen, *rbuflen; id = pw->pw_uid; break; + case 2 : /* unicode */ case 4 : if (( gr = (struct group *)getgrnam( ibuf )) == NULL ) { *rbuflen = 0; @@ -2014,9 +2155,6 @@ int ibuflen, *rbuflen; } id = gr->gr_gid; break; - default : - *rbuflen = 0; - return( AFPERR_PARAM ); } } else { id = 0; @@ -2086,28 +2224,23 @@ int ibuflen, *rbuflen; memcpy(&vid, ibuf, sizeof(vid)); ibuf += sizeof( vid ); - if (( vol = getvolbyvid( vid )) == NULL ) { + if (NULL == ( vol = getvolbyvid( vid )) ) { return( AFPERR_PARAM ); } memcpy(&did, ibuf, sizeof(did)); ibuf += sizeof(did); - if (( parentdir = dirlookup( vol, did )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( parentdir = dirlookup( vol, did )) ) { + return afp_errno; } - if (( path = cname( vol, parentdir, &ibuf )) == NULL ) { - switch( errno ) { - case EACCES: - return( AFPERR_ACCESS ); - default: - return( AFPERR_NOOBJ ); - } + if (NULL == ( path = cname( vol, parentdir, &ibuf )) ) { + return get_afp_errno(AFPERR_PARAM); } if ( *path->m_name != '\0' ) { - return( AFPERR_BADTYPE ); /* not a directory */ + return (path_isadir(path))? afp_errno:AFPERR_BADTYPE ; } if ( !path->st_valid && of_stat(path ) < 0 ) {