/*
- * $Id: ofork.c,v 1.19 2002-09-06 02:57:49 didg Exp $
+ * $Id: ofork.c,v 1.20.6.6.2.6 2008-08-16 20:40:55 didg Exp $
*
* Copyright (c) 1996 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
#include <stdio.h>
#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#include <string.h>
#include <sys/stat.h> /* works around a bug */
#include <sys/param.h>
#include <atalk/logger.h>
#include <errno.h>
-#include <atalk/adouble.h>
+#include <atalk/util.h>
#include "globals.h"
#include "volume.h"
}
}
+#ifdef DEBUG1
void of_pforkdesc( f )
FILE *f;
{
for ( ofrefnum = 0; ofrefnum < nforks; ofrefnum++ ) {
if ( oforks[ ofrefnum ] != NULL ) {
- fprintf( f, "%hu <%s>\n", ofrefnum, oforks[ ofrefnum ]->of_name);
+ fprintf( f, "%hu <%s>\n", ofrefnum, of_name(oforks[ ofrefnum ]));
}
}
}
+#endif
int of_flush(const struct vol *vol)
{
const struct vol *vol;
struct ofork *s_of;
struct dir *olddir, *newdir;
-const char *oldpath, *newpath;
+const char *oldpath _U_, *newpath;
{
struct ofork *of, *next, *d_ofork;
+ int done = 0;
if (!s_of)
return AFP_OK;
if (vol == of->of_vol && olddir == of->of_dir &&
s_of->key.dev == of->key.dev &&
s_of->key.inode == of->key.inode ) {
- strncpy( of->of_name, newpath, of->of_namelen);
+ if (!done) {
+ strlcpy( of_name(of), newpath, of->of_ad->ad_m_namelen);
+ done = 1;
+ }
if (newdir != olddir) {
of->of_d_prev->of_d_next = of->of_d_next;
of->of_d_next->of_d_prev = of->of_d_prev;
int i;
if (!oforks) {
- nforks = (getdtablesize() - 10) / 2;
+ nforks = getdtablesize() - 10;
/* protect against insane ulimit -n */
nforks = min(nforks, 0xffff);
oforks = (struct ofork **) calloc(nforks, sizeof(struct ofork *));
ad = malloc( sizeof( struct adouble ) );
if (!ad) {
LOG(log_error, logtype_afpd, "of_alloc: malloc: %s", strerror(errno) );
+ free(of);
+ oforks[ of_refnum ] = NULL;
return NULL;
}
/* initialize to zero. This is important to ensure that
ad_open really does reinitialize the structure. */
- memset( ad, 0, sizeof( struct adouble ) );
+ ad_init(ad, vol->v_adouble, vol->v_ad_options);
+
+ ad->ad_m_namelen = 255 +1;
+ /* here's the deal: we allocate enough for the standard mac file length.
+ * in the future, we'll reallocate in fairly large jumps in case
+ * of long unicode names */
+ if (( ad->ad_m_name =(char *)malloc( ad->ad_m_namelen )) == NULL ) {
+ LOG(log_error, logtype_afpd, "of_alloc: malloc: %s", strerror(errno) );
+ free(ad);
+ free(of);
+ oforks[ of_refnum ] = NULL;
+ return NULL;
+ }
+ strlcpy( ad->ad_m_name, path, ad->ad_m_namelen);
} else {
/* Increase the refcount on this struct adouble. This is
decremented again in oforc_dealloc. */
}
of->of_ad = ad;
-
of->of_vol = vol;
of->of_dir = dir;
d_ofork->of_d_prev = of;
}
- /* here's the deal: we allocate enough for the standard mac file length.
- * in the future, we'll reallocate in fairly large jumps in case
- * of long unicode names */
- if (( of->of_name =(char *)malloc(255 + 1)) == NULL ) {
- LOG(log_error, logtype_afpd, "of_alloc: malloc: %s", strerror(errno) );
- if (!ad)
- free(of->of_ad);
- free(of);
- oforks[ of_refnum ] = NULL;
- return NULL;
- }
- strncpy( of->of_name, path, of->of_namelen = 255 + 1);
*ofrefnum = refnum;
of->of_refnum = refnum;
of->key.dev = st->st_dev;
return( oforks[ ofrefnum % nforks ] );
}
-/* --------------------------
-*/
+/* -------------------------- */
+int of_stat (struct path *path)
+{
+int ret;
+ path->st_errno = 0;
+ path->st_valid = 1;
+ if ((ret = stat(path->u_name, &path->st)) < 0)
+ path->st_errno = errno;
+ return ret;
+}
+
+/* -------------------------- */
+int of_statdir (const struct vol *vol, struct path *path)
+{
+static char pathname[ MAXPATHLEN + 1];
+int ret;
+
+ if (*path->m_name) {
+ /* not curdir */
+ return of_stat (path);
+ }
+ path->st_errno = 0;
+ path->st_valid = 1;
+ /* FIXME, what about: we don't have r-x perm anymore ? */
+ strcpy(pathname, "../");
+ strlcat(pathname, path->d_dir->d_u_name, MAXPATHLEN);
+
+ if (!(ret = stat(pathname, &path->st)))
+ return 0;
+
+ path->st_errno = errno;
+ /* hmm, can't stat curdir anymore */
+ if (errno == EACCES && curdir->d_parent ) {
+ if (movecwd(vol, curdir->d_parent))
+ return -1;
+ path->st_errno = 0;
+ if ((ret = stat(path->d_dir->d_u_name, &path->st)) < 0)
+ path->st_errno = errno;
+ }
+ return ret;
+}
+
+/* -------------------------- */
struct ofork *
- of_findname(const char *name, struct stat *st)
+ of_findname(struct path *path)
{
struct ofork *of;
struct file_key key;
- struct stat buffer;
- char *p;
- if (st == NULL) {
- st = &buffer;
- if (stat(name, st) < 0)
- return NULL;
+ if (!path->st_valid) {
+ of_stat(path);
}
- key.dev = st->st_dev;
- key.inode = st->st_ino;
+
+ if (path->st_errno)
+ return NULL;
+
+ key.dev = path->st.st_dev;
+ key.inode = path->st.st_ino;
for (of = ofork_table[hashfn(&key)]; of; of = of->next) {
if (key.dev == of->key.dev && key.inode == of->key.inode ) {
}
oforks[ of->of_refnum % nforks ] = NULL;
- free( of->of_name );
/* decrease refcount */
of->of_ad->ad_refcount--;
if ( of->of_ad->ad_refcount <= 0) {
+ free( of->of_ad->ad_m_name );
free( of->of_ad);
} else {/* someone's still using it. just free this user's locks */
ad_unlock(of->of_ad, of->of_refnum);
free( of );
}
+
+/* ----------------------
+
+*/
+struct adouble *of_ad(const struct vol *vol, struct path *path, struct adouble *ad)
+{
+ struct ofork *of;
+ struct adouble *adp;
+
+ if ((of = of_findname(path))) {
+ adp = of->of_ad;
+ } else {
+ ad_init(ad, vol->v_adouble, vol->v_ad_options);
+ adp = ad;
+ }
+ return adp;
+}
+
projects / netatalk.git / blobdiff