lxc-destroy return 255 in case of error

to have same exit code for all lxc commands

Signed-off-by: Michel Normand <normand@fr.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

diff --git a/src/lxc/destroy.c b/src/lxc/destroy.c
index 610b7c246e3477c3e96a68406304e1ed27a3f6be..a06d23b9e631fdc0b5f8b6b4caee8ab116296da0 100644 (file)
--- a/src/lxc/destroy.c
+++ b/src/lxc/destroy.c
@@ -39,7 +39,7 @@ static int remove_lxc_directory(const char *dirname)
 {
        char path[MAXPATHLEN];
 
-       sprintf(path, LXCPATH "/%s", dirname);
+       snprintf(path, MAXPATHLEN, LXCPATH "/%s", dirname);
 
        if (rmdir(path)) {
                SYSERROR("failed to remove %s directory", path);
@@ -51,12 +51,12 @@ static int remove_lxc_directory(const char *dirname)
 
 int lxc_destroy(const char *name)
 {
-       int lock, ret = -LXC_ERROR_INTERNAL;
+       int lock, ret = -1;
        char path[MAXPATHLEN];
 
        lock = lxc_get_lock(name);
        if (lock < 0)
-               return lock;
+               return ret;
 
        if (lxc_rmstate(name)) {
                ERROR("failed to remove state file for %s", name);

diff --git a/src/lxc/lxc_destroy.c b/src/lxc/lxc_destroy.c
index ebd13bedd1ca6a26abf098324bf845bdf71fe92f..6c1cf3b8b5d19d3f8c14bf67a9c3ae45b5482164 100644 (file)
--- a/src/lxc/lxc_destroy.c
+++ b/src/lxc/lxc_destroy.c
@@ -22,7 +22,6 @@
  */
 #include <stdio.h>
 #include <unistd.h>
-#include <libgen.h>
 #include <sys/types.h>
 
 #include <lxc/lxc.h>
@@ -48,20 +47,13 @@ Options :\n\
 
 int main(int argc, char *argv[])
 {
-       int ret;
-
-       ret = lxc_arguments_parse(&my_args, argc, argv);
-       if (ret)
-               return 1;
+       if (lxc_arguments_parse(&my_args, argc, argv))
+               return -1;
 
        if (lxc_log_init(my_args.log_file, my_args.log_priority,
                         my_args.progname, my_args.quiet))
-               return 1;
-
-       ret = lxc_destroy(my_args.name);
-       if (ret)
-               return 1;
+               return -1;
 
-       return 0;
+       return lxc_destroy(my_args.name);
 }