Changeset 548
- Timestamp:
- 02/20/07 12:59:12 (2 years ago)
- Files:
-
- trunk/src/vcc/vcc/create.c (modified) (1 diff)
- trunk/src/vcc/vcc/exec.c (modified) (1 diff)
- trunk/src/vcc/vcc/kill.c (modified) (1 diff)
- trunk/src/vcc/vcc/list.c (modified) (1 diff)
- trunk/src/vcc/vcc/load.c (modified) (2 diffs)
- trunk/src/vcc/vcc/login.c (modified) (1 diff)
- trunk/src/vcc/vcc/reboot.c (modified) (2 diffs)
- trunk/src/vcc/vcc/remove.c (modified) (2 diffs)
- trunk/src/vcc/vcc/rename.c (modified) (1 diff)
- trunk/src/vcc/vcc/restart.c (modified) (2 diffs)
- trunk/src/vcc/vcc/start.c (modified) (2 diffs)
- trunk/src/vcc/vcc/status.c (modified) (2 diffs)
- trunk/src/vcc/vcc/stop.c (modified) (2 diffs)
- trunk/src/vcc/vcc/templates.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/vcc/vcc/create.c
r547 r548 25 25 void cmd_create(xmlrpc_env *env, int argc, char **argv) 26 26 { 27 char * template, *vdir = "";27 char *name, *template, *vdir = ""; 28 28 int force = 0, copy = 0; 29 29 30 if (argc < 1)30 if (argc < 2) 31 31 usage(EXIT_FAILURE); 32 32 33 template = argv[0]; 34 35 if (argc > 1) 36 sscanf(argv[1], "%d", &force); 33 name = argv[0]; 34 template = argv[1]; 37 35 38 36 if (argc > 2) 39 sscanf(argv[2], "%d", & copy);37 sscanf(argv[2], "%d", &force); 40 38 41 39 if (argc > 3) 42 vdir = argv[3]; 40 sscanf(argv[3], "%d", ©); 41 42 if (argc > 4) 43 vdir = argv[4]; 43 44 44 45 client_call("vx.create", "{s:s,s:s,s:b,s:b,s:s}", trunk/src/vcc/vcc/exec.c
r547 r548 28 28 { 29 29 xmlrpc_value *result; 30 char * command, *output;30 char *name, *command, *output; 31 31 32 if (argc < 1)32 if (argc < 2) 33 33 usage(EXIT_FAILURE); 34 35 name = argv[0]; 34 36 35 37 strtok_t st; 36 38 37 if (!strtok_init_argv(&st, argv , argc, 0))39 if (!strtok_init_argv(&st, argv + 1, argc - 1, 0)) 38 40 log_perror_and_die("strtok_init_argv"); 39 41 trunk/src/vcc/vcc/kill.c
r547 r548 27 27 int pid = 0, sig = 0; 28 28 29 if (argc < 2)29 if (argc < 3) 30 30 usage(EXIT_FAILURE); 31 31 32 sscanf(argv[0], "%d", &pid); 33 sscanf(argv[1], "%d", &sig); 32 char *name = argv[0]; 33 34 sscanf(argv[1], "%d", &pid); 35 sscanf(argv[2], "%d", &sig); 34 36 35 37 client_call("vx.kill", "{s:s,s:i,s:i}", trunk/src/vcc/vcc/list.c
r547 r548 24 24 { 25 25 xmlrpc_value *response, *result; 26 char *username ;26 char *username = ""; 27 27 int len, i; 28 28 29 response = client_call("vxdb.list", "{s:s}", "username", name); 29 if (argc > 0) 30 username = argv[0]; 31 32 response = client_call("vxdb.list", "{s:s}", "username", username); 30 33 return_if_fault(env); 31 34 trunk/src/vcc/vcc/load.c
r547 r548 16 16 // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 17 18 #include <stdlib.h> 18 19 #include <lucid/printf.h> 19 20 … … 24 25 { 25 26 xmlrpc_value *result; 26 char *loadavg1m, *loadavg5m, *loadavg15m; 27 char *name, *loadavg1m, *loadavg5m, *loadavg15m; 28 29 if (argc < 1) 30 usage(EXIT_FAILURE); 31 32 name = argv[0]; 27 33 28 34 result = client_call("vx.load", "{s:s}", "name", name); trunk/src/vcc/vcc/login.c
r547 r548 30 30 xmlrpc_value *result; 31 31 xid_t xid; 32 char * vdir;32 char *name, *vdir; 33 33 char *av[] = { "/bin/sh", NULL }; 34 35 if (argc < 1) 36 usage(EXIT_FAILURE); 37 38 name = argv[0]; 34 39 35 40 result = client_call("vxdb.xid.get", "{s:s}", "name", name); trunk/src/vcc/vcc/reboot.c
r547 r548 16 16 // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 17 18 #include <stdlib.h> 19 18 20 #include "vcc.h" 19 21 #include "cmd.h" … … 21 23 void cmd_reboot(xmlrpc_env *env, int argc, char **argv) 22 24 { 25 if (argc < 1) 26 usage(EXIT_FAILURE); 27 28 char *name = argv[0]; 29 23 30 client_call("vx.reboot", "{s:s}", "name", name); 24 31 } trunk/src/vcc/vcc/remove.c
r547 r548 16 16 // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 17 18 #include <stdlib.h> 19 18 20 #include "vcc.h" 19 21 #include "cmd.h" … … 21 23 void cmd_remove(xmlrpc_env *env, int argc, char **argv) 22 24 { 25 if (argc < 1) 26 usage(EXIT_FAILURE); 27 28 char *name = argv[0]; 29 23 30 client_call("vx.remove", "{s:s}", "name", name); 24 31 } trunk/src/vcc/vcc/rename.c
r547 r548 23 23 void cmd_rename(xmlrpc_env *env, int argc, char **argv) 24 24 { 25 char *n ewname;25 char *name, *newname; 26 26 27 if (argc < 1)27 if (argc < 2) 28 28 usage(EXIT_FAILURE); 29 29 30 newname = argv[0]; 30 name = argv[0]; 31 newname = argv[1]; 31 32 32 33 client_call("vx.rename", "{s:s,s:s}", "name", name, "newname", newname); trunk/src/vcc/vcc/restart.c
r547 r548 16 16 // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 17 18 #include <stdlib.h> 18 19 #include "vcc.h" 19 20 #include "cmd.h" … … 21 22 void cmd_restart(xmlrpc_env *env, int argc, char **argv) 22 23 { 24 if (argc < 1) 25 usage(EXIT_FAILURE); 26 27 char *name = argv[0]; 28 23 29 client_call("vx.restart", "{s:s}", "name", name); 24 30 } trunk/src/vcc/vcc/start.c
r547 r548 16 16 // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 17 18 #include <stdlib.h> 19 18 20 #include "vcc.h" 19 21 #include "cmd.h" … … 21 23 void cmd_start(xmlrpc_env *env, int argc, char **argv) 22 24 { 25 if (argc < 1) 26 usage(EXIT_FAILURE); 27 28 char *name = argv[0]; 29 23 30 client_call("vx.start", "{s:s}", "name", name); 24 31 } trunk/src/vcc/vcc/status.c
r547 r548 17 17 // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 18 18 19 #include <stdlib.h> 19 20 #include <lucid/printf.h> 20 21 … … 51 52 int running, nproc, uptime; 52 53 54 if (argc < 1) 55 usage(EXIT_FAILURE); 56 57 char *name = argv[0]; 58 53 59 result = client_call("vx.status", "{s:s}", "name", name); 54 60 return_if_fault(env); trunk/src/vcc/vcc/stop.c
r547 r548 16 16 // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 17 18 #include <stdlib.h> 19 18 20 #include "vcc.h" 19 21 #include "cmd.h" … … 21 23 void cmd_stop(xmlrpc_env *env, int argc, char **argv) 22 24 { 25 if (argc < 1) 26 usage(EXIT_FAILURE); 27 28 char *name = argv[0]; 29 23 30 client_call("vx.stop", "{s:s}", "name", name); 24 31 } trunk/src/vcc/vcc/templates.c
r547 r548 24 24 { 25 25 xmlrpc_value *response, *result; 26 char * tplname, *description;26 char *name = "", *description; 27 27 int len, i; 28 29 if (argc > 0) 30 name = argv[0]; 28 31 29 32 response = client_call("vx.templates", "{s:s}", "name", name); … … 38 41 39 42 xmlrpc_decompose_value(env, result, "{s:s,s:s,*}", 40 "name", & tplname,43 "name", &name, 41 44 "description", &description); 42 45 return_if_fault(env); … … 44 47 xmlrpc_DECREF(result); 45 48 46 printf("%s: %s\n", tplname, description);49 printf("%s: %s\n", name, description); 47 50 } 48 51
