-/*
+/*
* Copyright (c) 2009 Frank Lahm <franklahm@gmail.com>
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * SUCH DAMAGE.
*/
#ifdef HAVE_CONFIG_H
#endif /* HAVE_CONFIG_H */
#include <sys/types.h>
-#include <sys/acl.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/mman.h>
#include <unistd.h>
#include <stdarg.h>
#include <string.h>
+#include <libgen.h>
+#ifdef HAVE_SOLARIS_ACLS
+#include <sys/acl.h>
+#endif /* HAVE_SOLARIS_ACLS */
+
+#ifdef HAVE_POSIX_ACLS
+#include <sys/types.h>
+#include <sys/acl.h>
+#endif /* HAVE_POSIX_ACLS */
+
+#include <atalk/util.h>
#include <atalk/cnid.h>
#include <atalk/volinfo.h>
#include <atalk/bstrlib.h>
#include <atalk/bstradd.h>
-#include <atalk/util.h>
#include <atalk/logger.h>
#include <atalk/errchk.h>
#include <atalk/unicode.h>
/*!
* Load volinfo and initialize struct vol
*
+ * Only opens "dbd" volumes !
+ *
* @param path (r) path to evaluate
- * @param vol (rw) structure to initialize
-*
+ * @param vol (rw) structure to initialize
+ *
* @returns 0 on success, exits on error
*/
int openvol(const char *path, afpvol_t *vol)
memset(vol, 0, sizeof(afpvol_t));
/* try to find a .AppleDesktop/.volinfo */
- if (loadvolinfo((char *)path, &vol->volinfo) == 0) {
+ if (loadvolinfo((char *)path, &vol->volinfo) != 0)
+ return -1;
- if (vol_load_charsets(&vol->volinfo) == -1)
- ERROR("Error loading charsets!");
+ if (STRCMP(vol->volinfo.v_cnidscheme, != , "dbd"))
+ ERROR("\"%s\" isn't a \"dbd\" CNID volume!", vol->volinfo.v_path);
- /* Sanity checks to ensure we can touch this volume */
- if (vol->volinfo.v_adouble != AD_VERSION2)
- ERROR("Unsupported adouble versions: %u", vol->volinfo.v_adouble);
+ if (vol_load_charsets(&vol->volinfo) == -1)
+ ERROR("Error loading charsets!");
- if (vol->volinfo.v_vfs_ea != AFPVOL_EA_SYS)
- ERROR("Unsupported Extended Attributes option: %u", vol->volinfo.v_vfs_ea);
+ /* Sanity checks to ensure we can touch this volume */
+ if (vol->volinfo.v_adouble != AD_VERSION2)
+ ERROR("Unsupported adouble versions: %u", vol->volinfo.v_adouble);
- /* initialize sufficient struct vol for VFS initialisation */
- vol->volume.v_adouble = AD_VERSION2;
- vol->volume.v_vfs_ea = AFPVOL_EA_SYS;
- initvol_vfs(&vol->volume);
+ if (vol->volinfo.v_vfs_ea != AFPVOL_EA_SYS)
+ ERROR("Unsupported Extended Attributes option: %u", vol->volinfo.v_vfs_ea);
- if ((vol->volinfo.v_flags & AFPVOL_NODEV))
- flags |= CNID_FLAG_NODEV;
+ /* initialize sufficient struct vol for VFS initialisation */
+ vol->volume.v_adouble = AD_VERSION2;
+ vol->volume.v_vfs_ea = AFPVOL_EA_SYS;
+ initvol_vfs(&vol->volume);
- if ((vol->volume.v_cdb = cnid_open(vol->volinfo.v_dbpath,
- 0000,
- "dbd",
- flags,
- vol->volinfo.v_dbd_host,
- vol->volinfo.v_dbd_port)) == NULL)
- ERROR("Cant initialize CNID database connection for %s", vol->volinfo.v_path);
+ if ((vol->volinfo.v_flags & AFPVOL_NODEV))
+ flags |= CNID_FLAG_NODEV;
- cnid_getstamp(vol->volume.v_cdb,
- vol->db_stamp,
- sizeof(vol->db_stamp));
- }
+ if ((vol->volume.v_cdb = cnid_open(vol->volinfo.v_path,
+ 0000,
+ "dbd",
+ flags,
+ vol->volinfo.v_dbd_host,
+ vol->volinfo.v_dbd_port)) == NULL)
+ ERROR("Cant initialize CNID database connection for %s", vol->volinfo.v_path);
+ cnid_getstamp(vol->volume.v_cdb,
+ vol->db_stamp,
+ sizeof(vol->db_stamp));
+
return 0;
}
volinfo->v_maccharset,
u, outlen, mpath, MAXPATHLEN, &flags)) ) {
SLOG("Conversion from %s to %s for %s failed.",
- volinfo->v_volcodepage, volinfo->v_maccodepage, u);
+ volinfo->v_volcodepage, volinfo->v_maccodepage, u);
return NULL;
}
* "/afp_volume/dir/subdir"
*
* @param path (r) path relative to cwd() or absolute
- * @param volpath (r) volume path that path is a subdir of (has been computed in volinfo funcs)
+ * @param volpath (r) volume path that path is a subdir of (has been computed in volinfo funcs)
*
* @returns relative path in new bstring, caller must bdestroy it
*/
static bstring rel_path_in_vol(const char *path, const char *volpath)
{
EC_INIT;
+ int cwd = -1;
+ bstring fpath = NULL;
+ char *dname = NULL;
+ struct stat st;
if (path == NULL || volpath == NULL)
return NULL;
- bstring fpath = NULL;
+ EC_NEG1_LOG(cwd = open(".", O_RDONLY));
+
+ EC_ZERO_LOGSTR(lstat(path, &st), "lstat(%s): %s", path, strerror(errno));
+ switch (S_IFMT & st.st_mode) {
- /* Make path absolute by concetanating for case (a) */
- if (path[0] != '/') {
+ case S_IFREG:
+ case S_IFLNK:
+ EC_NULL_LOG(dname = strdup(path));
+ EC_ZERO_LOGSTR(chdir(dirname(dname)), "chdir(%s): %s", dirname, strerror(errno));
+ free(dname);
+ dname = NULL;
EC_NULL(fpath = bfromcstr(getcwdpath()));
- if (bchar(fpath, blength(fpath) - 1) != '/')
- EC_ZERO(bcatcstr(fpath, "/"));
- EC_ZERO(bcatcstr(fpath, path));
- BSTRING_STRIP_SLASH(fpath);
- } else {
- EC_NULL(fpath = bfromcstr(path));
BSTRING_STRIP_SLASH(fpath);
+ EC_ZERO(bcatcstr(fpath, "/"));
+ EC_NULL_LOG(dname = strdup(path));
+ EC_ZERO(bcatcstr(fpath, basename(dname)));
+ break;
+
+ case S_IFDIR:
+ EC_ZERO_LOGSTR(chdir(path), "chdir(%s): %s", path, strerror(errno));
+ EC_NULL(fpath = bfromcstr(getcwdpath()));
+ break;
+
+ default:
+ SLOG("special: %s", path);
+ EC_FAIL;
}
+ BSTRING_STRIP_SLASH(fpath);
+
/*
* Now we have eg:
* fpath: /Volume/netatalk/dir/bla
* we want: "dir/bla"
*/
EC_ZERO(bdelete(fpath, 0, strlen(volpath)));
- return fpath;
EC_CLEANUP:
- bdestroy(fpath);
- return NULL;
+ if (dname) free(dname);
+ if (cwd != -1) {
+ fchdir(cwd);
+ close(cwd);
+ }
+ if (ret != 0)
+ return NULL;
+ return fpath;
}
/*!
* (b) absolute:
* "/afp_volume/dir/subdir"
*
- * 1) start recursive CNID search with
- * a) DID:2 / "topdir"
- * b) DID:2 / "dir"
- * 2) ...until we have the CNID for
- * a) "/afp_volume/topdir/dir"
- * b) "/afp_volume/dir" (no recursion required)
+ * path MUST be pointing inside vol, this is usually the case as vol has been build from
+ * path using loadvolinfo and friends.
*
- * @param vi (r) pointer to volinfo struct
- * @param vol (r) pointer to vol struct
+ * @param vol (r) pointer to afpvol_t
* @param path (r) path, see above
* @param did (rw) parent CNID of returned CNID
*
* @returns CNID of path
*/
-cnid_t cnid_for_path(const struct volinfo *vi,
- const struct vol *vol,
+cnid_t cnid_for_path(const afpvol_t *vol,
const char *path,
cnid_t *did)
{
struct bstrList *l = NULL;
struct stat st;
- cnid = *did = htonl(2);
+ *did = htonl(1);
+ cnid = htonl(2);
- EC_NULL(rpath = rel_path_in_vol(path, vi->v_path));
- EC_NULL(statpath = bfromcstr(vi->v_path));
+ EC_NULL(rpath = rel_path_in_vol(path, vol->volinfo.v_path));
+ EC_NULL(statpath = bfromcstr(vol->volinfo.v_path));
l = bsplit(rpath, '/');
- for(int i = 0; i < l->qty ; i++) {
+ for (int i = 0; i < l->qty ; i++) {
*did = cnid;
EC_ZERO(bconcat(statpath, l->entry[i]));
- EC_ZERO_LOG(stat(cfrombstr(statpath), &st));
+ EC_ZERO_LOGSTR(lstat(cfrombstr(statpath), &st),
+ "lstat(rpath: %s, elem: %s): %s: %s",
+ cfrombstr(rpath), cfrombstr(l->entry[i]),
+ cfrombstr(statpath), strerror(errno));
+
+ if ((cnid = cnid_add(vol->volume.v_cdb,
+ &st,
+ *did,
+ cfrombstr(l->entry[i]),
+ blength(l->entry[i]),
+ 0)) == CNID_INVALID) {
+ EC_FAIL;
+ }
+ EC_ZERO(bcatcstr(statpath, "/"));
+ }
+
+EC_CLEANUP:
+ bdestroy(rpath);
+ bstrListDestroy(l);
+ bdestroy(statpath);
+ if (ret != 0)
+ return CNID_INVALID;
+
+ return cnid;
+}
+
+/*!
+ * Resolves CNID of a given paths parent directory
+ *
+ * path might be:
+ * (a) relative:
+ * "dir/subdir" with cwd: "/afp_volume/topdir"
+ * (b) absolute:
+ * "/afp_volume/dir/subdir"
+ *
+ * path MUST be pointing inside vol, this is usually the case as vol has been build from
+ * path using loadvolinfo and friends.
+ *
+ * @param vol (r) pointer to afpvol_t
+ * @param path (r) path, see above
+ * @param did (rw) parent CNID of returned CNID
+ *
+ * @returns CNID of path
+ */
+cnid_t cnid_for_paths_parent(const afpvol_t *vol,
+ const char *path,
+ cnid_t *did)
+{
+ EC_INIT;
- cnid = cnid_add(vol->v_cdb,
- &st,
- *did,
- cfrombstr(l->entry[i]),
- blength(l->entry[i]),
- 0);
+ cnid_t cnid;
+ bstring rpath = NULL;
+ bstring statpath = NULL;
+ struct bstrList *l = NULL;
+ struct stat st;
+
+ *did = htonl(1);
+ cnid = htonl(2);
+
+ EC_NULL(rpath = rel_path_in_vol(path, vol->volinfo.v_path));
+ EC_NULL(statpath = bfromcstr(vol->volinfo.v_path));
+ l = bsplit(rpath, '/');
+ if (l->qty == 1)
+ /* only one path element, means parent dir cnid is volume root = 2 */
+ goto EC_CLEANUP;
+ for (int i = 0; i < (l->qty - 1); i++) {
+ *did = cnid;
+ EC_ZERO(bconcat(statpath, l->entry[i]));
+ EC_ZERO_LOGSTR(lstat(cfrombstr(statpath), &st),
+ "lstat(rpath: %s, elem: %s): %s: %s",
+ cfrombstr(rpath), cfrombstr(l->entry[i]),
+ cfrombstr(statpath), strerror(errno));
+
+ if ((cnid = cnid_add(vol->volume.v_cdb,
+ &st,
+ *did,
+ cfrombstr(l->entry[i]),
+ blength(l->entry[i]),
+ 0)) == CNID_INVALID) {
+ EC_FAIL;
+ }
EC_ZERO(bcatcstr(statpath, "/"));
-
}
EC_CLEANUP:
return cnid;
}
-
projects / netatalk.git / blobdiff