#include <atalk/globals.h>
#include <atalk/netatalk_conf.h>
#include <atalk/unix.h>
+#include <atalk/bstrlib.h>
#include "volume.h"
#include "directory.h"
#include "desktop.h"
#include "mangle.h"
-typedef struct _special_folder {
- const char *name;
- int precreate;
- mode_t mode;
- int hide;
-} _special_folder;
-
-static const _special_folder special_folders[] = {
- {".AppleDesktop", 1, 0777, 0},
- {NULL, 0, 0, 0}};
-
-/*
- * precreate a folder
- * this is only intended for folders in the volume root
- * It will *not* work if the folder name contains extended characters
- */
-static int create_special_folder (const struct vol *vol, const struct _special_folder *folder)
+static void create_appledesktop_folder(const struct vol * vol)
{
- char *p,*q,*r;
- struct adouble ad;
- uint16_t attr;
+ bstring olddtpath = NULL, dtpath = NULL;
struct stat st;
- int ret;
-
+ char *cmd_argv[4];
- p = (char *) malloc ( strlen(vol->v_path)+strlen(folder->name)+2);
- if ( p == NULL) {
- LOG(log_error, logtype_afpd,"malloc failed");
- exit (EXITERR_SYS);
- }
+ olddtpath = bfromcstr(vol->v_path);
+ bcatcstr(olddtpath, "/" APPLEDESKTOP);
- q=strdup(folder->name);
- if ( q == NULL) {
- LOG(log_error, logtype_afpd,"malloc failed");
- exit (EXITERR_SYS);
- }
+ dtpath = bfromcstr(vol->v_dbpath);
+ bcatcstr(dtpath, "/" APPLEDESKTOP);
- strcpy(p, vol->v_path);
- strcat(p, "/");
+ if (lstat(bdata(dtpath), &st) != 0) {
- r=q;
- while (*r) {
- if ((vol->v_casefold & AFPVOL_MTOUUPPER))
- *r=toupper(*r);
- else if ((vol->v_casefold & AFPVOL_MTOULOWER))
- *r=tolower(*r);
- r++;
- }
- strcat(p, q);
+ become_root();
- if ( (ret = stat( p, &st )) < 0 ) {
- if (folder->precreate) {
- if (ad_mkdir(p, folder->mode)) {
- LOG(log_debug, logtype_afpd,"Creating '%s' failed in %s: %s", p, vol->v_path, strerror(errno));
- free(p);
- free(q);
- return -1;
+ if (lstat(bdata(olddtpath), &st) == 0) {
+ cmd_argv[0] = "mv";
+ cmd_argv[1] = bdata(olddtpath);
+ cmd_argv[2] = bdata(dtpath);
+ cmd_argv[3] = NULL;
+ if (run_cmd("mv", cmd_argv) != 0) {
+ LOG(log_error, logtype_afpd, "moving .AppleDesktop from \"%s\" to \"%s\" failed",
+ bdata(olddtpath), bdata(dtpath));
+ mkdir(bdata(dtpath), 0777);
}
- ret = 0;
- }
- }
-
- if ( !ret && folder->hide) {
- /* Hide it */
- ad_init(&ad, vol);
- if (ad_open(&ad, p, ADFLAGS_HF | ADFLAGS_DIR | ADFLAGS_RDWR | ADFLAGS_CREATE, 0666) != 0) {
- free(p);
- free(q);
- return (-1);
- }
-
- ad_setname(&ad, folder->name);
-
- ad_getattr(&ad, &attr);
- attr |= htons( ntohs( attr ) | ATTRBIT_INVISIBLE );
- ad_setattr(&ad, attr);
-
- /* do the same with the finder info */
- if (ad_entry(&ad, ADEID_FINDERI)) {
- memcpy(&attr, ad_entry(&ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, sizeof(attr));
- attr |= htons(FINDERINFO_INVISIBLE);
- memcpy(ad_entry(&ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF,&attr, sizeof(attr));
+ } else {
+ mkdir(bdata(dtpath), 0777);
}
- ad_flush(&ad);
- ad_close(&ad, ADFLAGS_HF);
- }
- free(p);
- free(q);
- return 0;
-}
-
-static void create_appledesktop_folder(const struct vol * vol)
-{
- const _special_folder *p = &special_folders[0];
-
- become_root();
-
- for (; p->name != NULL; p++) {
- create_special_folder (vol, p);
+ unbecome_root();
}
- unbecome_root();
+ bdestroy(dtpath);
+ bdestroy(olddtpath);
}
int afp_opendt(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen)
return AFPERR_PARAM;
}
+#ifndef WITH_SENDFILE
if ((buflen = dsi_readinit(dsi, rbuf, buflen, rc, AFP_OK)) < 0)
goto geticon_exit;
+#endif
*rbuflen = buflen;
/* do to the streaming nature, we have to exit if we encounter
* a problem. much confusion results otherwise. */
while (*rbuflen > 0) {
#ifdef WITH_SENDFILE
- if (dsi_stream_read_file(dsi, si.sdt_fd, offset, dsi->datasize) < 0) {
+ if (dsi_stream_read_file(dsi, si.sdt_fd, offset, dsi->datasize, AFP_OK) < 0) {
switch (errno) {
case ENOSYS:
case EINVAL: /* there's no guarantee that all fs support sendfile */
char *p;
unsigned int i;
- strcpy( path, vol->v_path );
- strcat( path, "/.AppleDesktop/" );
+ strcpy( path, vol->v_dbpath );
+ strcat( path, "/" APPLEDESKTOP "/" );
for ( p = path; *p != '\0'; p++ )
;