#include <atalk/adouble.h>
#include <atalk/cnid.h>
-#include <atalk/volinfo.h>
#include "ad.h"
#define ADv2_DIRNAME ".AppleDouble"
if (S_ISDIR(st->st_mode))
adflags = ADFLAGS_DIR;
- if (vol->volinfo.v_path == NULL)
+ if (vol->vol == NULL || vol->vol->v_path == NULL)
return;
- ad_init(&ad, vol->volinfo.v_adouble, vol->volinfo.v_ad_options);
+ ad_init(&ad, vol->vol);
if ( ad_metadata(path, adflags, &ad) < 0 )
return;
else
printf(" !ADVOL_CACHE ");
- ad_close_metadata(&ad);
+ ad_close(&ad, ADFLAGS_HF);
}
#define TYPE(b) ((st->st_mode & (S_IFMT)) == (b))
return ret;
}
-int ad_ls(int argc, char **argv)
+int ad_ls(int argc, char **argv, AFPObj *obj)
{
int c, firstarg;
afpvol_t vol;
cnid_init();
if ((argc - optind) == 0) {
- openvol(".", &vol);
+ openvol(obj, ".", &vol);
ad_ls_r(".", &vol);
closevol(&vol);
}
first = 1;
recursion = 0;
- openvol(argv[optind], &vol);
+ openvol(obj, argv[optind], &vol);
ad_ls_r(argv[optind], &vol);
closevol(&vol);
next:
first = 1;
recursion = 0;
- openvol(argv[optind], &vol);
+ openvol(obj, argv[optind], &vol);
ad_ls_r(argv[optind], &vol);
closevol(&vol);