Remove Makefiles and use autotools

[ngadmin] / cli / com_firmware.c

diff --git a/cli/com_firmware.c b/cli/com_firmware.c
index e4bc68265d06fa2f1846bbeb83595b5ac8c6e03a..3d5e76c2437ec2161fca9a83a064fd82aa2a53a3 100644 (file)
--- a/cli/com_firmware.c
+++ b/cli/com_firmware.c
@@ -2,55 +2,58 @@
 #include "commands.h"
 
 
-
-bool do_firmware_show (int nb UNUSED, const char **com UNUSED, struct ngadmin *nga) {
- 
- const struct swi_attr *sa;
- bool ret=true;
- 
- 
- if ( (sa=ngadmin_getCurrentSwitch(nga))==NULL ) {
-  printf("must be logged\n");
-  ret=false;
-  goto end;
- }
- 
- puts(sa->firmware);
- 
- 
- end:
- 
- return ret;
- 
+int do_firmware_show (int argc, const char **argv UNUSED, struct ngadmin *nga)
+{
+       const struct swi_attr *sa;
+       int ret = 0;
+       
+       
+       if (argc > 0) {
+               printf("this command takes no argument\n");
+               ret = 1;
+               goto end;
+       }
+       
+       sa = ngadmin_getCurrentSwitch(nga);
+       if (sa == NULL) {
+               printf("must be logged\n");
+               ret = 1;
+               goto end;
+       }
+       
+       puts(sa->firmware);
+       
+end:
+       
+       return ret;
 }
 
 
-
-bool do_firmware_upgrade (int nb, const char **com UNUSED, struct ngadmin *nga) {
- 
- const struct swi_attr *sa;
- bool ret=true;
- 
- 
- if ( nb!=1 ) {
-  printf("Usage: firmware upgrade <file>\n");
-  ret=false;
- }
- 
- if ( (sa=ngadmin_getCurrentSwitch(nga))==NULL ) {
-  printf("must be logged\n");
-  ret=false;
-  goto end;
- }
- 
- printf("not implemented yet\n");
- 
- 
- end:
- 
- return ret;
- 
+int do_firmware_upgrade (int argc, const char **argv, struct ngadmin *nga)
+{
+       const struct swi_attr *sa;
+       int i, ret = 0;
+       
+       
+       if (argc != 1) {
+               printf("usage: firmware upgrade <file>\n");
+               ret = 1;
+               goto end;
+       }
+       
+       sa = ngadmin_getCurrentSwitch(nga);
+       if (sa == NULL) {
+               printf("must be logged\n");
+               ret = 1;
+               goto end;
+       }
+       
+       i = ngadmin_upgradeFirmware(nga, argv[0]);
+       printErrCode(i);
+       
+end:
+       
+       return ret;
 }
 
 
-