sysname-list-instead-of-simple-name-20010605

[openafs.git] / src / venus / fs.c

diff --git a/src/venus/fs.c b/src/venus/fs.c
index 9de42c6..2fdaf07 100644 (file)
--- a/src/venus/fs.c
+++ b/src/venus/fs.c
@@ -2085,29 +2085,33 @@ static SysNameCmd(as)
     struct ViceIoctl blob;
     struct cmd_item *ti;
     char *input = space;
-    afs_int32 setp = 1;
+    afs_int32 setp = 0;
 
     ti = as->parms[0].items;
-    if (!ti) setp = 0;
     blob.in = space;
     blob.out = space;
     blob.out_size = MAXSIZE;
     blob.in_size = sizeof(afs_int32);
-    bcopy(&setp, input, sizeof(afs_int32));
     input += sizeof(afs_int32);
-    if (ti) {
-       strcpy(input, ti->data);
+    for(; ti; ti=ti->next) {
+       setp++;
        blob.in_size += strlen(ti->data) + 1;
+       if (blob.in_size > MAXSIZE) {
+         fprintf(stderr, "%s: sysname%s too long.\n", pn, setp > 1 ? "s" : "");
+         return 1;
+       }
+       strcpy(input, ti->data);
        input += strlen(ti->data);
        *(input++) = '\0';
     }
+    bcopy(&setp, space, sizeof(afs_int32));
     code = pioctl(0, VIOC_AFS_SYSNAME, &blob, 1);
     if (code) {
        Die(errno, 0);
        return 1;
     }
     if (setp) {
-       printf("%s: new sysname set.\n", pn);
+       printf("%s: new sysname%s set.\n", pn, setp > 1 ? " list" : "");
        return 0;
     }
     input = space;
@@ -2117,7 +2121,12 @@ static SysNameCmd(as)
        fprintf(stderr, "No sysname name value was found\n");
        return 1;
     }
-    printf("Current sysname is '%s'\n", input);
+    printf("Current sysname%s is:", setp>1 ? " list" : "");
+    for(;setp>0;--setp) {
+      printf(" %s", input);
+      input += strlen(input) + 1;
+    }
+    printf("\n");
     return 0;
 }
 
@@ -3024,7 +3033,7 @@ defect 3069
     cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");
 
     ts = cmd_CreateSyntax("sysname", SysNameCmd, 0, "get/set sysname (i.e. @sys) value");
-    cmd_AddParm(ts, "-newsys", CMD_SINGLE, CMD_OPTIONAL, "new sysname");
+    cmd_AddParm(ts, "-newsys", CMD_LIST, CMD_OPTIONAL, "new sysname");
 
     ts = cmd_CreateSyntax("exportafs", ExportAfsCmd, 0, "enable/disable translators to AFS");
     cmd_AddParm(ts, "-type", CMD_SINGLE, 0, "exporter name");