X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Ffile.c;h=c8101048e038ecbc52c1acd6db978047435c2234;hb=260c314546ffcfdbef47f2c7de82d5310b26df0a;hp=4c954e4e80f8daccb64bac9731b975749d035a5a;hpb=15c1fc2f2328736dd428ec3be37c893d8ee2e065;p=netatalk.git diff --git a/etc/afpd/file.c b/etc/afpd/file.c index 4c954e4e..c8101048 100644 --- a/etc/afpd/file.c +++ b/etc/afpd/file.c @@ -76,22 +76,16 @@ static int default_type(void *finder) /* FIXME path : unix or mac name ? (for now it's unix name ) */ void *get_finderinfo(const struct vol *vol, const char *upath, struct adouble *adp, void *data, int islink) { - struct extmap *em; void *ad_finder = NULL; int chk_ext = 0; - - if (adp) + ad_finder = ad_entry(adp, ADEID_FINDERI); if (ad_finder) { memcpy(data, ad_finder, ADEDLEN_FINDERI); - /* default type ? */ - if (default_type(ad_finder)) - chk_ext = 1; } else { memcpy(data, ufinderi, ADEDLEN_FINDERI); - chk_ext = 1; if (vol_inv_dots(vol) && *upath == '.') { /* make it invisible */ uint16_t ashort; @@ -107,14 +101,8 @@ void *get_finderinfo(const struct vol *vol, const char *upath, struct adouble *a memcpy((char *)data + FINDERINFO_FRFLAGOFF, &linkflag, 2); memcpy((char *)data + FINDERINFO_FRTYPEOFF,"slnk",4); memcpy((char *)data + FINDERINFO_FRCREATOFF,"rhap",4); - chk_ext = 0; } - /** Only enter if no appledouble information and no finder information found. */ - if (chk_ext && (em = getextmap( upath ))) { - memcpy(data, em->em_type, sizeof( em->em_type )); - memcpy((char *)data + 4, em->em_creator, sizeof(em->em_creator)); - } return data; } @@ -249,8 +237,7 @@ restart: vol->v_path); vol->v_cdb = cnid_open(vol->v_path, vol->v_umask, "tdb", flags, NULL, NULL); if (vol->v_cdb) { - /* deactivate cnid caching/storing in AppleDouble files and set ro mode*/ - vol->v_flags &= ~AFPVOL_CACHE; + /* set ro mode*/ vol->v_flags |= AFPVOL_RO; #ifdef SERVERTEXT /* kill ourself with SIGUSR2 aka msg pending */ @@ -609,6 +596,7 @@ int getfilparams(struct vol *vol, struct adouble ad, *adp; int opened = 0; int rc; + int flags; LOG(log_debug, logtype_afpd, "getfilparams(\"%s\")", path->u_name); @@ -617,7 +605,7 @@ int getfilparams(struct vol *vol, if (opened) { char *upath; - int flags = (bitmap & (1 << FILPBIT_ATTR)) ? ADFLAGS_CHECK_OF : 0; + flags = (bitmap & (1 << FILPBIT_ATTR)) ? ADFLAGS_CHECK_OF : 0; adp = of_ad(vol, path, &ad); upath = path->u_name; @@ -639,7 +627,7 @@ int getfilparams(struct vol *vol, } } rc = getmetadata(vol, bitmap, path, dir, buf, buflen, adp); - ad_close_metadata( adp); + ad_close(adp, ADFLAGS_HF | flags); return( rc ); } @@ -677,12 +665,11 @@ int afp_createfile(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, if (NULL == ( s_path = cname( vol, dir, &ibuf )) ) return get_afp_errno(AFPERR_PARAM); - if ( *s_path->m_name == '\0' ) return( AFPERR_BADTYPE ); upath = s_path->u_name; - ad_init(&ad, vol->v_adouble, vol->v_ad_options); + ad_init(&ad, vol); /* if upath is deleted we already in trouble anyway */ if ((of = of_findname(s_path))) { @@ -692,15 +679,14 @@ int afp_createfile(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, return AFPERR_EXIST; } - if ( creatf) - openf = O_RDWR|O_CREAT|O_TRUNC; + if (creatf) + openf = ADFLAGS_RDWR | ADFLAGS_CREATE | ADFLAGS_TRUNC; else /* on a soft create, if the file is open then ad_open won't fail because open syscall is not called */ - openf = O_RDWR|O_CREAT|O_EXCL; + openf = ADFLAGS_RDWR | ADFLAGS_CREATE | ADFLAGS_EXCL; - if ( ad_open(&ad, upath, ADFLAGS_DF | ADFLAGS_HF | ADFLAGS_NOHF, - openf, 0666, openf, 0666) < 0 ) { + if (ad_open(&ad, upath, ADFLAGS_DF | ADFLAGS_HF | ADFLAGS_NOHF | openf, 0666) < 0) { switch ( errno ) { case EROFS: return AFPERR_VLOCK; @@ -718,11 +704,6 @@ int afp_createfile(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, } } if ( ad_meta_fileno( &ad ) == -1 ) { /* Hard META / HF */ - /* on noadouble volumes, just creating the data fork is ok */ - if (vol_noadouble(vol)) { - ad_close( &ad, ADFLAGS_DF ); - goto createfile_done; - } /* FIXME with hard create on an existing file, we already * corrupted the data file. */ @@ -827,9 +808,7 @@ int setfilparams(struct vol *vol, uint32_t aint; uint32_t upriv; uint16_t upriv_bit = 0; - - struct utimbuf ut; - + struct utimbuf ut; int change_mdate = 0; int change_parent_mdate = 0; int newdate = 0; @@ -839,6 +818,7 @@ int setfilparams(struct vol *vol, uint16_t bitmap = f_bitmap; uint32_t cdate,bdate; u_char finder_buf[32]; + int symlinked = 0; #ifdef DEBUG LOG(log_debug9, logtype_afpd, "begin setfilparams:"); @@ -881,16 +861,15 @@ int setfilparams(struct vol *vol, case FILPBIT_FINFO : change_mdate = 1; memcpy(finder_buf, buf, 32 ); - if (memcmp(buf,"slnkrhap",8)==0 && !S_ISLNK(path->st.st_mode)){ - // SLFINFO + if (memcmp(buf, "slnkrhap", 8) == 0 && !S_ISLNK(path->st.st_mode)) { int fp; ssize_t len; int erc=1; char buf[PATH_MAX+1]; - if ((fp=open(path->u_name,O_RDONLY))>=0){ - if ((len=read(fp,buf,PATH_MAX+1))){ - if (unlink(path->u_name)==0){ - buf[len]=0; + if ((fp = open(path->u_name, O_RDONLY)) >= 0) { + if ((len = read(fp, buf, PATH_MAX+1))) { + if (unlink(path->u_name) == 0) { + buf[len] = 0; erc = symlink(buf, path->u_name); if (!erc) of_stat(path); @@ -898,10 +877,11 @@ int setfilparams(struct vol *vol, } close(fp); } - if (erc!=0){ + if (erc != 0) { err=AFPERR_BITMAP; goto setfilparam_done; } + symlinked = 1; } buf += 32; break; @@ -965,14 +945,14 @@ int setfilparams(struct vol *vol, /* second try with adouble open */ - if ( ad_open(adp, upath, ADFLAGS_HF, O_RDWR | O_CREAT, 0666) < 0) { + if (ad_open(adp, upath, ADFLAGS_HF | ADFLAGS_RDWR | ADFLAGS_CREATE, 0666) < 0) { LOG(log_debug, logtype_afpd, "setfilparams: ad_open_metadata error"); /* * For some things, we don't need an adouble header: * - change of modification date * - UNIX privs (Bug-ID #2863424) */ - if (!vol_noadouble(vol) && (f_bitmap & ~(1<m_name )) && - !memcmp(finder_buf, em->em_type, sizeof( em->em_type )) && - !memcmp(finder_buf + 4, em->em_creator,sizeof( em->em_creator))) - || ((em = getdefextmap()) && - !memcmp(finder_buf, em->em_type, sizeof( em->em_type )) && - !memcmp(finder_buf + 4, em->em_creator,sizeof( em->em_creator))) - )) { - memcpy(finder_buf, ufinderi, 8 ); - } memcpy(ad_entry( adp, ADEID_FINDERI ), finder_buf, 32 ); break; case FILPBIT_UNIXPR : @@ -1057,8 +1026,8 @@ setfilparam_done: } if (isad) { - ad_flush( adp); - ad_close_metadata( adp); + ad_flush(adp); + ad_close(adp, ADFLAGS_HF); } if (change_parent_mdate && gettimeofday(&tv, NULL) == 0) { @@ -1145,7 +1114,7 @@ int renamefile(const struct vol *vol, int sdir_fd, char *src, char *dst, char *n } /* don't care if we can't open the newly renamed ressource fork */ - if (ad_open(adp, dst, ADFLAGS_HF, O_RDWR) == 0) { + if (ad_open(adp, dst, ADFLAGS_HF | ADFLAGS_RDWR) == 0) { ad_setname(adp, newname); ad_flush( adp ); ad_close( adp, ADFLAGS_HF ); @@ -1273,7 +1242,7 @@ int afp_copyfile(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, si adp = of_ad(s_vol, s_path, &ad); - if (ad_open(adp, s_path->u_name, ADFLAGS_DF | ADFLAGS_HF | ADFLAGS_NOHF, O_RDONLY, O_RDONLY) < 0) { + if (ad_open(adp, s_path->u_name, ADFLAGS_DF | ADFLAGS_HF | ADFLAGS_NOHF | ADFLAGS_RDONLY | ADFLAGS_SETSHRMD) < 0) { return AFPERR_DENYCONF; } denyreadset = (ad_testlock(adp, ADEID_DFORK, AD_FILELOCK_DENY_RD) != 0 || @@ -1340,108 +1309,10 @@ int afp_copyfile(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, si setvoltime(obj, d_vol ); copy_exit: - ad_close( adp, ADFLAGS_DF |ADFLAGS_HF ); + ad_close( adp, ADFLAGS_DF |ADFLAGS_HF | ADFLAGS_SETSHRMD); return( retvalue ); } -/* ----------------------- */ -static int copy_all(const int dfd, const void *buf, - size_t buflen) -{ - ssize_t cc; - -#ifdef DEBUG - LOG(log_debug9, logtype_afpd, "begin copy_all:"); -#endif /* DEBUG */ - - while (buflen > 0) { - if ((cc = write(dfd, buf, buflen)) < 0) { - switch (errno) { - case EINTR: - continue; - default: - return -1; - } - } - buflen -= cc; - } - -#ifdef DEBUG - LOG(log_debug9, logtype_afpd, "end copy_all:"); -#endif /* DEBUG */ - - return 0; -} - -/* -------------------------- - * copy only the fork data stream -*/ -static int copy_fork(int eid, struct adouble *add, struct adouble *ads) -{ - ssize_t cc; - int err = 0; - char filebuf[8192]; - int sfd, dfd; - - if (eid == ADEID_DFORK) { - sfd = ad_data_fileno(ads); - dfd = ad_data_fileno(add); - } - else { - sfd = ad_reso_fileno(ads); - dfd = ad_reso_fileno(add); - } - - if ((off_t)-1 == lseek(sfd, ad_getentryoff(ads, eid), SEEK_SET)) - return -1; - - if ((off_t)-1 == lseek(dfd, ad_getentryoff(add, eid), SEEK_SET)) - return -1; - -#if 0 /* ifdef SENDFILE_FLAVOR_LINUX */ - /* doesn't work With 2.6 FIXME, only check for EBADFD ? */ - off_t offset = 0; - size_t size; - struct stat st; - #define BUF 128*1024*1024 - - if (fstat(sfd, &st) == 0) { - - while (1) { - if ( offset >= st.st_size) { - return 0; - } - size = (st.st_size -offset > BUF)?BUF:st.st_size -offset; - if ((cc = sys_sendfile(dfd, sfd, &offset, size)) < 0) { - switch (errno) { - case ENOSYS: - case EINVAL: /* there's no guarantee that all fs support sendfile */ - goto no_sendfile; - default: - return -1; - } - } - } - } - no_sendfile: - lseek(sfd, offset, SEEK_SET); -#endif - - while (1) { - if ((cc = read(sfd, filebuf, sizeof(filebuf))) < 0) { - if (errno == EINTR) - continue; - err = -1; - break; - } - - if (!cc || ((err = copy_all(dfd, filebuf, cc)) < 0)) { - break; - } - } - return err; -} - /* ---------------------------------- * if newname is NULL (from directory.c) we don't want to copy the resource fork. * because we are doing it elsewhere. @@ -1466,24 +1337,20 @@ int copyfile(const struct vol *s_vol, sfd, src, dst, newname); if (adp == NULL) { - ad_init(&ads, s_vol->v_adouble, s_vol->v_ad_options); + ad_init(&ads, s_vol); adp = &ads; } - adflags = ADFLAGS_DF; - if (newname) { - adflags |= ADFLAGS_HF; - } + adflags = ADFLAGS_DF | ADFLAGS_RF | ADFLAGS_NORF; - if (ad_openat(adp, sfd, src, adflags | ADFLAGS_NOHF, O_RDONLY, O_RDONLY) < 0) { + if (ad_openat(adp, sfd, src, adflags | ADFLAGS_RDONLY) < 0) { ret_err = errno; goto done; } - if (ad_meta_fileno(adp) == -1 && ad_reso_fileno(adp) == -1) { /* META / HF */ + if (!AD_RSRC_OPEN(adp)) /* no resource fork, don't create one for dst file */ - adflags &= ~ADFLAGS_HF; - } + adflags &= ~ADFLAGS_RF; stat_result = fstat(ad_data_fileno(adp), &st); /* saving stat exit code, thus saving us on one more stat later on */ @@ -1492,8 +1359,8 @@ int copyfile(const struct vol *s_vol, st.st_mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH; } - ad_init(&add, d_vol->v_adouble, d_vol->v_ad_options); - if (ad_open(&add, dst, adflags, O_RDWR|O_CREAT|O_EXCL, st.st_mode, O_RDWR|O_CREAT|O_EXCL, st.st_mode) < 0) { + ad_init(&add, d_vol); + if (ad_open(&add, dst, adflags | ADFLAGS_RDWR | ADFLAGS_CREATE | ADFLAGS_EXCL, st.st_mode | S_IRUSR | S_IWUSR) < 0) { ret_err = errno; ad_close( adp, adflags ); if (EEXIST != ret_err) { @@ -1502,21 +1369,16 @@ int copyfile(const struct vol *s_vol, } return AFPERR_EXIST; } - - /* - * XXX if the source and the dest don't use the same resource type it's broken - */ - if (ad_reso_fileno(adp) == -1 || 0 == (err = copy_fork(ADEID_RFORK, &add, adp))){ - /* copy the data fork */ - if ((err = copy_fork(ADEID_DFORK, &add, adp)) == 0) { - if (ad_meta_fileno(adp) != -1) - err = d_vol->vfs->vfs_copyfile(d_vol, sfd, src, dst); - } - } - if (err < 0) { + if ((err = copy_fork(ADEID_DFORK, &add, adp)) != 0) + LOG(log_error, logtype_afpd, "copyfile('%s'): %s", src, strerror(errno)); + + if (err == 0) + if ((err = d_vol->vfs->vfs_copyfile(d_vol, sfd, src, dst)) != 0) + LOG(log_error, logtype_afpd, "copyfile('%s'): %s", src, strerror(errno)); + + if (err < 0) ret_err = errno; - } if (!ret_err && newname && (adflags & ADFLAGS_HF)) { /* set the new name in the resource fork */ @@ -1602,7 +1464,7 @@ int deletefile(const struct vol *vol, int dirfd, char *file, int checkAttrib) LOG(log_debug, logtype_afpd, "deletefile('%s')", file); - ad_init(&ad, vol->v_adouble, vol->v_ad_options); + ad_init(&ad, vol); if (checkAttrib) { /* was EACCESS error try to get only metadata */ /* we never want to create a resource fork here, we are going to delete it @@ -1611,7 +1473,7 @@ int deletefile(const struct vol *vol, int dirfd, char *file, int checkAttrib) */ if ( ad_metadataat(dirfd, file, ADFLAGS_CHECK_OF, &ad) == 0 ) { if ((err = check_attrib(&ad))) { - ad_close_metadata(&ad); + ad_close(&ad, ADFLAGS_HF | ADFLAGS_CHECK_OF); return err; } meta = 1; @@ -1620,7 +1482,7 @@ int deletefile(const struct vol *vol, int dirfd, char *file, int checkAttrib) /* try to open both forks at once */ adflags = ADFLAGS_DF; - if ( ad_openat(&ad, dirfd, file, adflags |ADFLAGS_HF|ADFLAGS_NOHF, O_RDONLY, O_RDONLY) < 0 ) { + if (ad_openat(&ad, dirfd, file, adflags | ADFLAGS_RF | ADFLAGS_NORF | ADFLAGS_RDONLY) < 0 ) { switch (errno) { case ENOENT: err = AFPERR_NOOBJ; @@ -1639,8 +1501,8 @@ int deletefile(const struct vol *vol, int dirfd, char *file, int checkAttrib) adp = &ad; } - if ( adp && ad_reso_fileno( adp ) != -1 ) { /* there's a resource fork */ - adflags |= ADFLAGS_HF; + if ( adp && AD_RSRC_OPEN(adp) != -1 ) { /* there's a resource fork */ + adflags |= ADFLAGS_RF; /* FIXME we have a pb here because we want to know if a file is open * there's a 'priority inversion' if you can't open the ressource fork RW * you can delete it if it's open because you can't get a write lock. @@ -1657,6 +1519,7 @@ int deletefile(const struct vol *vol, int dirfd, char *file, int checkAttrib) } if (adp && ad_tmplock( &ad, ADEID_DFORK, ADLOCK_WR, 0, 0, 0 ) < 0) { + LOG(log_error, logtype_afpd, "deletefile('%s'): ad_tmplock error: %s", file, strerror(errno)); err = AFPERR_BUSY; } else if (!(err = vol->vfs->vfs_deletefile(vol, dirfd, file)) && !(err = netatalk_unlinkat(dirfd, file )) ) { cnid_t id; @@ -1667,7 +1530,7 @@ int deletefile(const struct vol *vol, int dirfd, char *file, int checkAttrib) end: if (meta) - ad_close_metadata(&ad); + ad_close(&ad, ADFLAGS_HF | ADFLAGS_CHECK_OF); if (adp) ad_close( &ad, adflags ); /* ad_close removes locks if any */ @@ -2030,7 +1893,7 @@ static struct adouble *find_adouble(struct path *path, struct ofork **of, struct adp = (*of)->of_ad; } else { - ret = ad_open(adp, path->u_name, ADFLAGS_HF, O_RDONLY); + ret = ad_open(adp, path->u_name, ADFLAGS_HF | ADFLAGS_RDWR); /* META and HF */ if ( !ret && ad_reso_fileno(adp) != -1 && !(adp->ad_resource_fork.adf_flags & ( O_RDWR | O_WRONLY))) { /* from AFP spec. @@ -2115,7 +1978,7 @@ int afp_exchangefiles(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U return AFPERR_PARAM ; } - ad_init(&ads, vol->v_adouble, vol->v_ad_options); + ad_init(&ads, vol); if (!(adsp = find_adouble( path, &s_of, &ads))) { return afp_errno; } @@ -2148,7 +2011,7 @@ int afp_exchangefiles(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U goto err_exchangefile; } - ad_init(&add, vol->v_adouble, vol->v_ad_options); + ad_init(&add, vol); if (!(addp = find_adouble( path, &d_of, &add))) { err = afp_errno; goto err_exchangefile;