extern void afsi_log(char *pattern, ...);
-afs_uint32 cm_pioctlFollowMountPoint = 0;
-
void cm_InitIoctl(void)
{
lock_InitializeMutex(&cm_Afsdsbmt_Lock, "AFSDSBMT.INI Access Lock");
/* parse the passed-in file name and do a namei on it. If we fail,
* return an error code, otherwise return the vnode located in *scpp.
*/
+#define CM_PARSE_FLAG_LITERAL 1
+
long cm_ParseIoctlPath(smb_ioctl_t *ioctlp, cm_user_t *userp, cm_req_t *reqp,
- cm_scache_t **scpp)
+ cm_scache_t **scpp, afs_uint32 flags)
{
long code;
#ifndef AFSIFS
#endif
char * relativePath;
char * lastComponent = NULL;
- afs_uint32 follow = (cm_pioctlFollowMountPoint ? CM_FLAG_FOLLOW : CM_FLAG_NOMOUNTCHASE);
+ afs_uint32 follow = (flags & CM_PARSE_FLAG_LITERAL ? CM_FLAG_NOMOUNTCHASE : CM_FLAG_FOLLOW);
relativePath = ioctlp->inDatap;
/* setup the next data value for the caller to use */
void cm_SkipIoctlPath(smb_ioctl_t *ioctlp)
{
- long temp;
+ size_t temp;
- temp = (long) strlen(ioctlp->inDatap) + 1;
+ temp = strlen(ioctlp->inDatap) + 1;
ioctlp->inDatap += temp;
}
+/*
+ * Must be called before cm_ParseIoctlPath or cm_SkipIoctlPath
+ */
+static cm_ioctlQueryOptions_t *
+cm_IoctlGetQueryOptions(struct smb_ioctl *ioctlp, struct cm_user *userp)
+{
+ afs_uint32 pathlen = strlen(ioctlp->inDatap) + 1;
+ char *p = ioctlp->inDatap + pathlen;
+ cm_ioctlQueryOptions_t * optionsp = NULL;
+
+ if (ioctlp->inCopied > p - ioctlp->inAllocp) {
+ optionsp = (cm_ioctlQueryOptions_t *)p;
+ if (optionsp->size < 12 /* minimum size of struct */)
+ optionsp = NULL;
+ }
+
+ return optionsp;
+}
+
+/*
+ * Must be called after cm_ParseIoctlPath or cm_SkipIoctlPath
+ * or any other time that ioctlp->inDatap points at the
+ * cm_ioctlQueryOptions_t object.
+ */
+static void
+cm_IoctlSkipQueryOptions(struct smb_ioctl *ioctlp, struct cm_user *userp)
+{
+ cm_ioctlQueryOptions_t * optionsp = (cm_ioctlQueryOptions_t *)ioctlp->inDatap;
+ ioctlp->inDatap += optionsp->size;
+}
/* format the specified path to look like "/afs/<cellname>/usr", by
* adding "/afs" (if necessary) in front, changing any \'s to /'s, and
int tlen;
cm_req_t req;
struct rx_connection * callp;
+ cm_ioctlQueryOptions_t *optionsp;
+ afs_uint32 flags = 0;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
- if (code) return code;
+ optionsp = cm_IoctlGetQueryOptions(ioctlp, userp);
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_LITERAL(optionsp))
+ flags |= (optionsp->literal ? CM_PARSE_FLAG_LITERAL : 0);
+
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_FID(optionsp)) {
+ cm_SkipIoctlPath(ioctlp);
+
+ code = cm_GetSCache(&optionsp->fid, &scp, userp, &req);
+ } else {
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, flags);
+ }
+ if (code)
+ return code;
/* now make the get acl call */
#ifdef AFS_FREELANCE_CLIENT
cm_scache_t *scp;
cm_cell_t *cellp;
cm_req_t req;
+ cm_ioctlQueryOptions_t *optionsp;
+ afs_uint32 flags = 0;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
- if (code) return code;
+ optionsp = cm_IoctlGetQueryOptions(ioctlp, userp);
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_LITERAL(optionsp))
+ flags |= (optionsp->literal ? CM_PARSE_FLAG_LITERAL : 0);
+
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_FID(optionsp)) {
+ cm_SkipIoctlPath(ioctlp);
+ code = cm_GetSCache(&optionsp->fid, &scp, userp, &req);
+ } else {
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, flags);
+ }
+ if (code)
+ return code;
#ifdef AFS_FREELANCE_CLIENT
if ( cm_freelanceEnabled &&
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, 0);
if (code) return code;
#ifdef AFS_FREELANCE_CLIENT
cm_InitReq(&req);
+ cm_SkipIoctlPath(ioctlp); /* we don't care about the path */
+
lock_ObtainWrite(&cm_scacheLock);
for (i=0; i<cm_data.scacheHashTableSize; i++) {
for (scp = cm_data.scacheHashTablep[i]; scp; scp = scp->nextp) {
unsigned long volume;
unsigned long cell;
cm_req_t req;
+ cm_ioctlQueryOptions_t *optionsp;
+ afs_uint32 flags = 0;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
- if (code) return code;
-
+ optionsp = cm_IoctlGetQueryOptions(ioctlp, userp);
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_LITERAL(optionsp))
+ flags |= (optionsp->literal ? CM_PARSE_FLAG_LITERAL : 0);
+
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_FID(optionsp)) {
+ cm_SkipIoctlPath(ioctlp);
+ code = cm_GetSCache(&optionsp->fid, &scp, userp, &req);
+ } else {
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, flags);
+ }
+ if (code)
+ return code;
+
#ifdef AFS_FREELANCE_CLIENT
if ( scp->fid.cell == AFS_FAKE_ROOT_CELL_ID && scp->fid.volume == AFS_FAKE_ROOT_VOL_ID ) {
code = CM_ERROR_NOACCESS;
long code;
cm_scache_t *scp;
cm_req_t req;
+ cm_ioctlQueryOptions_t *optionsp;
+ afs_uint32 flags = 0;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
- if (code) return code;
-
+ optionsp = cm_IoctlGetQueryOptions(ioctlp, userp);
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_LITERAL(optionsp))
+ flags |= (optionsp->literal ? CM_PARSE_FLAG_LITERAL : 0);
+
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_FID(optionsp)) {
+ cm_SkipIoctlPath(ioctlp);
+ code = cm_GetSCache(&optionsp->fid, &scp, userp, &req);
+ } else {
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, flags);
+ }
+ if (code)
+ return code;
+
#ifdef AFS_FREELANCE_CLIENT
if ( scp->fid.cell == AFS_FAKE_ROOT_CELL_ID && scp->fid.volume == AFS_FAKE_ROOT_VOL_ID ) {
code = CM_ERROR_NOACCESS;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, 0);
if (code) return code;
#ifdef AFS_FREELANCE_CLIENT
char *MOTD;
cm_req_t req;
struct rx_connection * callp;
+ cm_ioctlQueryOptions_t *optionsp;
+ afs_uint32 flags = 0;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
- if (code) return code;
+ optionsp = cm_IoctlGetQueryOptions(ioctlp, userp);
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_LITERAL(optionsp))
+ flags |= (optionsp->literal ? CM_PARSE_FLAG_LITERAL : 0);
+
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_FID(optionsp)) {
+ cm_SkipIoctlPath(ioctlp);
+ code = cm_GetSCache(&optionsp->fid, &scp, userp, &req);
+ } else {
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, flags);
+ }
+ if (code)
+ return code;
#ifdef AFS_FREELANCE_CLIENT
if ( scp->fid.cell == AFS_FAKE_ROOT_CELL_ID && scp->fid.volume == AFS_FAKE_ROOT_VOL_ID ) {
register char *cp;
cm_fid_t fid;
cm_req_t req;
+ cm_ioctlQueryOptions_t * optionsp;
+ afs_uint32 flags = 0;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
+ optionsp = cm_IoctlGetQueryOptions(ioctlp, userp);
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_LITERAL(optionsp))
+ flags |= (optionsp->literal ? CM_PARSE_FLAG_LITERAL : 0);
+
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, flags);
if (code) return code;
memset(&fid, 0, sizeof(cm_fid_t));
+ fid.cell = scp->fid.cell;
fid.volume = scp->fid.volume;
fid.vnode = scp->fid.vnode;
fid.unique = scp->fid.unique;
return 0;
}
+long cm_IoctlGetFileType(struct smb_ioctl *ioctlp, struct cm_user *userp)
+{
+ cm_scache_t *scp;
+ register long code;
+ register char *cp;
+ afs_uint32 fileType = 0;
+ cm_req_t req;
+ cm_ioctlQueryOptions_t * optionsp;
+ afs_uint32 flags = 0;
+
+ cm_InitReq(&req);
+
+ optionsp = cm_IoctlGetQueryOptions(ioctlp, userp);
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_LITERAL(optionsp))
+ flags |= (optionsp->literal ? CM_PARSE_FLAG_LITERAL : 0);
+
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_FID(optionsp)) {
+ cm_SkipIoctlPath(ioctlp);
+ code = cm_GetSCache(&optionsp->fid, &scp, userp, &req);
+ } else {
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, flags);
+ }
+ if (code)
+ return code;
+
+ fileType = scp->fileType;
+ cm_ReleaseSCache(scp);
+
+ /* Copy all this junk into msg->im_data, keeping track of the lengths. */
+ cp = ioctlp->outDatap;
+ memcpy(cp, (char *)&fileType, sizeof(fileType));
+ cp += sizeof(fileType);
+
+ /* return new size */
+ ioctlp->outDatap = cp;
+
+ return 0;
+}
+
long cm_IoctlGetOwner(struct smb_ioctl *ioctlp, struct cm_user *userp)
{
cm_scache_t *scp;
register long code;
register char *cp;
cm_req_t req;
+ cm_ioctlQueryOptions_t *optionsp;
+ afs_uint32 flags = 0;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
- if (code) return code;
+ optionsp = cm_IoctlGetQueryOptions(ioctlp, userp);
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_LITERAL(optionsp))
+ flags |= (optionsp->literal ? CM_PARSE_FLAG_LITERAL : 0);
+
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_FID(optionsp)) {
+ cm_SkipIoctlPath(ioctlp);
+ code = cm_GetSCache(&optionsp->fid, &scp, userp, &req);
+ } else {
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, flags);
+ }
+ if (code)
+ return code;
/* Copy all this junk into msg->im_data, keeping track of the lengths. */
cp = ioctlp->outDatap;
unsigned long volume;
char *cp;
cm_req_t req;
+ cm_ioctlQueryOptions_t *optionsp;
+ afs_uint32 flags = 0;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
- if (code) return code;
-
+ optionsp = cm_IoctlGetQueryOptions(ioctlp, userp);
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_LITERAL(optionsp))
+ flags |= (optionsp->literal ? CM_PARSE_FLAG_LITERAL : 0);
+
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_FID(optionsp)) {
+ cm_SkipIoctlPath(ioctlp);
+ code = cm_GetSCache(&optionsp->fid, &scp, userp, &req);
+ } else {
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, flags);
+ }
+ if (code)
+ return code;
+
volume = scp->fid.volume;
cellp = cm_FindCellByID(scp->fid.cell, 0);
if (!cellp)
return CM_ERROR_NOSUCHCELL;
- code = cm_GetVolumeByID(cellp, volume, userp, &req, CM_GETVOL_FLAG_CREATE, &tvp);
- if (code)
- return code;
+#ifdef AFS_FREELANCE_CLIENT
+ if ( cellp->cellID == AFS_FAKE_ROOT_CELL_ID) {
+ struct in_addr addr;
+
+ addr.s_net = 127;
+ addr.s_host = 0;
+ addr.s_lh = 0;
+ addr.s_impno = 1;
+
+ cp = ioctlp->outDatap;
+
+ memcpy(cp, (char *)&addr, sizeof(addr));
+ cp += sizeof(addr);
+
+ /* still room for terminating NULL, add it on */
+ addr.s_addr = 0;
+ memcpy(cp, (char *)&addr, sizeof(addr));
+ cp += sizeof(addr);
+
+ ioctlp->outDatap = cp;
+ } else
+#endif
+ {
+ code = cm_GetVolumeByID(cellp, volume, userp, &req, CM_GETVOL_FLAG_CREATE, &tvp);
+ if (code)
+ return code;
- cp = ioctlp->outDatap;
+ cp = ioctlp->outDatap;
- lock_ObtainMutex(&tvp->mx);
- tsrpp = cm_GetVolServers(tvp, volume);
- lock_ObtainRead(&cm_serverLock);
- for (current = *tsrpp; current; current = current->next) {
- tsp = current->server;
- memcpy(cp, (char *)&tsp->addr.sin_addr.s_addr, sizeof(long));
- cp += sizeof(long);
- }
- lock_ReleaseRead(&cm_serverLock);
- cm_FreeServerList(tsrpp, 0);
- lock_ReleaseMutex(&tvp->mx);
+ lock_ObtainMutex(&tvp->mx);
+ tsrpp = cm_GetVolServers(tvp, volume);
+ lock_ObtainRead(&cm_serverLock);
+ for (current = *tsrpp; current; current = current->next) {
+ tsp = current->server;
+ memcpy(cp, (char *)&tsp->addr.sin_addr.s_addr, sizeof(long));
+ cp += sizeof(long);
+ }
+ lock_ReleaseRead(&cm_serverLock);
+ cm_FreeServerList(tsrpp, 0);
+ lock_ReleaseMutex(&tvp->mx);
- /* still room for terminating NULL, add it on */
- volume = 0; /* reuse vbl */
- memcpy(cp, (char *)&volume, sizeof(long));
- cp += sizeof(long);
+ /* still room for terminating NULL, add it on */
+ volume = 0; /* reuse vbl */
+ memcpy(cp, (char *)&volume, sizeof(long));
+ cp += sizeof(long);
- ioctlp->outDatap = cp;
- cm_PutVolume(tvp);
+ ioctlp->outDatap = cp;
+ cm_PutVolume(tvp);
+ }
return 0;
}
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &dscp);
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &dscp, 0);
if (code) return code;
cp = ioctlp->inDatap;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &dscp);
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &dscp, 0);
if (code) return code;
cp = ioctlp->inDatap;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &dscp);
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &dscp, 0);
if (code) return code;
cp = ioctlp->inDatap;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &dscp);
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &dscp, 0);
if (code) return code;
cp = ioctlp->inDatap;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &dscp);
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &dscp, 0);
if (code) return code;
cp = ioctlp->inDatap;
cm_vol_state_t *statep;
afs_uint32 volume;
cm_req_t req;
+ cm_ioctlQueryOptions_t *optionsp;
+ afs_uint32 flags = 0;
cm_InitReq(&req);
- code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp);
+ optionsp = cm_IoctlGetQueryOptions(ioctlp, userp);
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_LITERAL(optionsp))
+ flags |= (optionsp->literal ? CM_PARSE_FLAG_LITERAL : 0);
+
+ if (optionsp && CM_IOCTL_QOPTS_HAVE_FID(optionsp)) {
+ cm_SkipIoctlPath(ioctlp);
+ code = cm_GetSCache(&optionsp->fid, &scp, userp, &req);
+ } else {
+ code = cm_ParseIoctlPath(ioctlp, userp, &req, &scp, flags);
+ }
if (code)
return code;
afs_int32 code;
struct ViceIoctl blob;
struct cmd_item *ti;
-
int error = 0;
+ int literal = 0;
+ cm_ioctlQueryOptions_t options;
+ if (as->parms[1].items)
+ literal = 1;
+
for(ti=as->parms[0].items; ti; ti=ti->next) {
- blob.in_size = blob.out_size = 0;
+ /* once per file */
+ memset(&options, 0, sizeof(options));
+ options.size = sizeof(options);
+ options.field_flags |= CM_IOCTL_QOPTS_FIELD_LITERAL;
+ options.literal = literal;
+ blob.in_size = options.size; /* no variable length data */
+ blob.in = &options;
+
+ blob.out_size = 0;
code = pioctl(ti->data, VIOCFLUSH, &blob, 0);
if (code) {
if (errno == EMFILE) {
return error;
}
-#ifndef WIN32
-/*
- * Why is VenusFid declared in the kernel-only section of afs.h,
- * if it's the exported interface of the (UNIX) cache manager?
- */
-struct VenusFid {
- afs_int32 Cell;
- AFSFid Fid;
-};
-#endif /* WIN32 */
+/* values match cache manager File Types */
+static char *
+filetypestr(afs_uint32 type)
+{
+ char * s = "Object";
+
+ switch (type) {
+ case 1: /* file */
+ s = "File";
+ break;
+ case 2:
+ s = "Directory";
+ break;
+ case 3:
+ s = "Symlink";
+ break;
+ case 4:
+ s = "Mountpoint";
+ break;
+ case 5:
+ s = "DfsLink";
+ break;
+ }
+ return s;
+}
static int
ExamineCmd(struct cmd_syndesc *as, void *arock)
struct VolumeStatus *status;
char *name, *offmsg, *motd;
int error = 0;
-
+ int literal = 0;
+ cm_ioctlQueryOptions_t options;
+
+ if (as->parms[1].items)
+ literal = 1;
+
SetDotDefault(&as->parms[0].items);
for(ti=as->parms[0].items; ti; ti=ti->next) {
cm_fid_t fid;
+ afs_uint32 filetype;
afs_uint32 owner[2];
char cell[MAXCELLCHARS];
- code = GetCell(ti->data, cell);
- if (code) {
- Die(errno, ti->data);
- error = 1;
- continue;
- }
-
- /* once per file */
- blob.in_size = 0;
+ /* once per file */
+ memset(&fid, 0, sizeof(fid));
+ memset(&options, 0, sizeof(options));
+ filetype = 0;
+ options.size = sizeof(options);
+ options.field_flags |= CM_IOCTL_QOPTS_FIELD_LITERAL;
+ options.literal = literal;
+ blob.in_size = options.size; /* no variable length data */
+ blob.in = &options;
blob.out_size = sizeof(cm_fid_t);
blob.out = (char *) &fid;
if (0 == pioctl(ti->data, VIOCGETFID, &blob, 1)) {
- printf("File %s (%u.%u.%u) contained in cell %s\n",
- ti->data, fid.volume, fid.vnode, fid.unique,
- cell);
+ options.field_flags |= CM_IOCTL_QOPTS_FIELD_FID;
+ options.fid = fid;
+ } else {
+ Die(errno, ti->data);
+ error = 1;
+ continue;
}
+ blob.out_size = sizeof(filetype);
+ blob.out = &filetype;
+
+ code = pioctl(ti->data, VIOC_GETFILETYPE, &blob, 1);
+
+ blob.out_size = MAXCELLCHARS;
+ blob.out = cell;
+
+ code = pioctl(ti->data, VIOC_FILE_CELL_NAME, &blob, 1);
+ printf("%s %s (%u.%u.%u) contained in cell %s\n",
+ filetypestr(filetype),
+ ti->data, fid.volume, fid.vnode, fid.unique,
+ code ? "unknown-cell" : cell);
+
blob.out_size = 2 * sizeof(afs_uint32);
blob.out = (char *) &owner;
if (0 == pioctl(ti->data, VIOCGETOWNER, &blob, 1)) {
afs_int32 *hosts;
char *tp;
int error = 0;
+ int literal = 0;
+ cm_ioctlQueryOptions_t options;
+
+ if (as->parms[1].items)
+ literal = 1;
SetDotDefault(&as->parms[0].items);
for(ti=as->parms[0].items; ti; ti=ti->next) {
- /* once per file */
- blob.out_size = MAXSIZE;
- blob.in_size = 0;
+ cm_fid_t fid;
+ afs_uint32 filetype;
+
+ /* once per file */
+ memset(&fid, 0, sizeof(fid));
+ memset(&options, 0, sizeof(options));
+ filetype = 0;
+ options.size = sizeof(options);
+ options.field_flags |= CM_IOCTL_QOPTS_FIELD_LITERAL;
+ options.literal = literal;
+ blob.in_size = options.size; /* no variable length data */
+ blob.in = &options;
+
+ blob.out_size = sizeof(cm_fid_t);
+ blob.out = (char *) &fid;
+ if (0 == pioctl(ti->data, VIOCGETFID, &blob, 1)) {
+ options.field_flags |= CM_IOCTL_QOPTS_FIELD_FID;
+ options.fid = fid;
+ } else {
+ Die(errno, ti->data);
+ error = 1;
+ continue;
+ }
+
+ blob.out_size = sizeof(filetype);
+ blob.out = &filetype;
+
+ code = pioctl(ti->data, VIOC_GETFILETYPE, &blob, 1);
+
+ blob.out_size = MAXSIZE;
blob.out = space;
memset(space, 0, sizeof(space));
code = pioctl(ti->data, VIOCWHEREIS, &blob, 1);
continue;
}
hosts = (afs_int32 *) space;
- printf("File %s is on host%s ", ti->data,
+ printf("%s %s is on host%s ",
+ filetypestr(filetype),
+ ti->data,
(hosts[0] && !hosts[1]) ? "": "s");
for(j=0; j<MAXHOSTS; j++) {
if (hosts[j] == 0)
{
afs_int32 code;
struct cmd_item *ti;
+ struct ViceIoctl blob;
int error = 0;
- char cell[MAXCELLCHARS]="";
+ int literal = 0;
+ cm_ioctlQueryOptions_t options;
+
+ if (as->parms[1].items)
+ literal = 1;
SetDotDefault(&as->parms[0].items);
for(ti=as->parms[0].items; ti; ti=ti->next) {
- code = GetCell(ti->data, cell);
+ cm_fid_t fid;
+ afs_uint32 filetype;
+ char cell[MAXCELLCHARS];
+
+ /* once per file */
+ memset(&fid, 0, sizeof(fid));
+ memset(&options, 0, sizeof(options));
+ filetype = 0;
+ options.size = sizeof(options);
+ options.field_flags |= CM_IOCTL_QOPTS_FIELD_LITERAL;
+ options.literal = literal;
+ blob.in_size = options.size; /* no variable length data */
+ blob.in = &options;
+
+ blob.out_size = sizeof(cm_fid_t);
+ blob.out = (char *) &fid;
+ if (0 == pioctl(ti->data, VIOCGETFID, &blob, 1)) {
+ options.field_flags |= CM_IOCTL_QOPTS_FIELD_FID;
+ options.fid = fid;
+ } else {
+ Die(errno, ti->data);
+ error = 1;
+ continue;
+ }
+
+ blob.out_size = sizeof(filetype);
+ blob.out = &filetype;
+
+ code = pioctl(ti->data, VIOC_GETFILETYPE, &blob, 1);
+
+ blob.out_size = MAXCELLCHARS;
+ blob.out = cell;
+
+ code = pioctl(ti->data, VIOC_FILE_CELL_NAME, &blob, 1);
if (code) {
if (errno == ENOENT)
fprintf(stderr,"%s: no such cell as '%s'\n", pn, ti->data);
error = 1;
continue;
}
- printf("File %s lives in cell '%s'\n", ti->data, cell);
+ printf("%s %s lives in cell '%s'\n",
+ filetypestr(filetype),
+ ti->data, cell);
}
return error;
}
}
*/
+#ifndef AFS_NT40_ENV
static int
MonitorCmd(struct cmd_syndesc *as, void *arock)
{
}
return 0;
}
+#endif /* AFS_NT40_ENV */
static int
SysNameCmd(struct cmd_syndesc *as, void *arock)
return 0;
}
+#ifndef AFS_NT40_ENV
static char *exported_types[] = {"null", "nfs", ""};
static int ExportAfsCmd(struct cmd_syndesc *as, void *arock)
{
}
return 0;
}
-
+#endif
static int
GetCellCmd(struct cmd_syndesc *as, void *arock)
{
afs_int32 code;
- code = ugen_ClientInit(noAuthFlag, AFSDIR_CLIENT_ETC_DIRPATH,
+ code = ugen_ClientInit(noAuthFlag, (char *)AFSDIR_CLIENT_ETC_DIRPATH,
info->name, 0, &uclient,
NULL, pn, rxkad_clear,
VLDB_MAXSERVERS, AFSCONF_VLDBSERVICE, 50,
ts = cmd_CreateSyntax("flush", FlushCmd, NULL, "flush file from cache");
cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");
+ cmd_AddParm(ts, "-literal", CMD_FLAG, CMD_OPTIONAL, "literal evaluation of mountpoints and symlinks");
#ifndef WIN32
ts = cmd_CreateSyntax("flushmount", FlushMountCmd, NULL,
ts = cmd_CreateSyntax("examine", ExamineCmd, NULL, "display file/volume status");
cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");
+ cmd_AddParm(ts, "-literal", CMD_FLAG, CMD_OPTIONAL, "literal evaluation of mountpoints and symlinks");
cmd_CreateAlias(ts, "lv");
cmd_CreateAlias(ts, "listvol");
ts = cmd_CreateSyntax("whichcell", WhichCellCmd, NULL, "list file's cell");
cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");
+ cmd_AddParm(ts, "-literal", CMD_FLAG, CMD_OPTIONAL, "literal evaluation of mountpoints and symlinks");
ts = cmd_CreateSyntax("whereis", WhereIsCmd, NULL, "list file's location");
cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");
+ cmd_AddParm(ts, "-literal", CMD_FLAG, CMD_OPTIONAL, "literal evaluation of mountpoints and symlinks");
ts = cmd_CreateSyntax("wscell", WSCellCmd, NULL, "list workstation's cell");
ts = cmd_CreateSyntax("primarycell", PrimaryCellCmd, 0, "obsolete (listed primary cell)");
*/
+#ifndef AFS_NT40_ENV
ts = cmd_CreateSyntax("monitor", MonitorCmd, NULL, "set cache monitor host address");
cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "host name or 'off'");
cmd_CreateAlias(ts, "mariner");
-
-
+#endif
+
ts = cmd_CreateSyntax("getcellstatus", GetCellCmd, NULL, "get cell status");
cmd_AddParm(ts, "-cell", CMD_LIST, 0, "cell name");
ts = cmd_CreateSyntax("sysname", SysNameCmd, NULL, "get/set sysname (i.e. @sys) value");
cmd_AddParm(ts, "-newsys", CMD_LIST, CMD_OPTIONAL, "new sysname");
+#ifndef AFS_NT40_ENV
ts = cmd_CreateSyntax("exportafs", ExportAfsCmd, NULL, "enable/disable translators to AFS");
cmd_AddParm(ts, "-type", CMD_SINGLE, 0, "exporter name");
cmd_AddParm(ts, "-start", CMD_SINGLE, CMD_OPTIONAL, "start/stop translator ('on' or 'off')");
cmd_AddParm(ts, "-convert", CMD_SINGLE, CMD_OPTIONAL, "convert from afs to unix mode ('on or 'off')");
cmd_AddParm(ts, "-uidcheck", CMD_SINGLE, CMD_OPTIONAL, "run on strict 'uid check' mode ('on' or 'off')");
cmd_AddParm(ts, "-submounts", CMD_SINGLE, CMD_OPTIONAL, "allow nfs mounts to subdirs of /afs/.. ('on' or 'off')");
-
+#endif
ts = cmd_CreateSyntax("storebehind", StoreBehindCmd, NULL,
"store to server after file close");
git://git.openafs.org / openafs.git / commitdiff