Fixed bad variable type

From: Daniel Lezcano <daniel.lezcano@free.fr>

Fixed the type of the opt variable. On the powerpc architecture, that leads
to an infinite loop in the getopt inspection because getopt returns 255
instead of -1 as expected. The opt variable should be an int and not a char.

Signed-off-by: Daniel Lezcano <daniel.lezcano@free.fr>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

diff --git a/lxc.spec.in b/lxc.spec.in
index fe901fafa5fa33b6985355357d7d2eeb0dc09dec..db4018ac9ffa6c796fc1482f51fdcd266233cdf2 100644 (file)
--- a/lxc.spec.in
+++ b/lxc.spec.in
@@ -80,7 +80,7 @@ setcap cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep \
 setcap cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep \
     %{_bindir}/lxc-unshare && \
 setcap cap_sys_admin=ep \
-    %{_bindir}/lxc-init &&
+    %{_bindir}/lxc-init && \
 setcap cap_sys_admin=ep \
     %{_bindir}/lxc-netstat
 

diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index 5a412cadb5366421ee3214bdab9df5766f4489cd..721fdd3ad7227dc08fc79b27287783eb58fc1ee3 100644 (file)
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -37,7 +37,7 @@ void usage(char *cmd)
 
 int main(int argc, char *argv[])
 {
-       char opt;
+       int opt;
        char *name = NULL, *subsystem = NULL, *value = NULL;
        int nbargs = 0;
 

diff --git a/src/lxc/lxc_checkpoint.c b/src/lxc/lxc_checkpoint.c
index 480ffba79cbddbf095b0b964bd364f57139222ea..7d4aa3b3a60c827393b0dbb5c6b6602e0b9a4028 100644 (file)
--- a/src/lxc/lxc_checkpoint.c
+++ b/src/lxc/lxc_checkpoint.c
@@ -36,7 +36,7 @@ void usage(char *cmd)
 
 int main(int argc, char *argv[])
 {
-       char opt;
+       int opt;
        char *name = NULL;
        int stop = 0;
        int nbargs = 0;

diff --git a/src/lxc/lxc_console.c b/src/lxc/lxc_console.c
index 6a9881a4f0321b3572d60e184f3c6142cbe75340..6d5aef0aee82f7148975329b318579e5ad935018 100644 (file)
--- a/src/lxc/lxc_console.c
+++ b/src/lxc/lxc_console.c
@@ -50,8 +50,8 @@ void usage(char *cmd)
 
 int main(int argc, char *argv[])
 {
-       char opt;
        char *name = NULL;
+       int opt;
        int ttynum = 0;
        int nbargs = 0;
        int master = -1;

diff --git a/src/lxc/lxc_destroy.c b/src/lxc/lxc_destroy.c
index 012c0a8aa5fad932677e332c2939f0a716342f6b..1964a06ccb91f0b89ca0938f11b6a3b0f919cfdd 100644 (file)
--- a/src/lxc/lxc_destroy.c
+++ b/src/lxc/lxc_destroy.c
@@ -36,8 +36,8 @@ void usage(char *cmd)
 
 int main(int argc, char *argv[])
 {
-       char opt;
        char *name = NULL;
+       int opt;
        int nbargs = 0;
        int err;
 

diff --git a/src/lxc/lxc_execute.c b/src/lxc/lxc_execute.c
index 12d15c34dbd9144b8d188d5303a5f632e439efaa..362c03e557dd485a960471e1a16fac8d654b1abd 100644 (file)
--- a/src/lxc/lxc_execute.c
+++ b/src/lxc/lxc_execute.c
@@ -43,10 +43,10 @@ void usage(char *cmd)
 
 int main(int argc, char *argv[])
 {
-       char opt;
        char *name = NULL, *file = NULL;
        static char **args;
        char path[MAXPATHLEN];
+       int opt;
        int nbargs = 0;
        int autodestroy = 0;
        int ret = 1;

diff --git a/src/lxc/lxc_freeze.c b/src/lxc/lxc_freeze.c
index 06d5a53b37046c0783d3b068a1cf740b1c6e6b1f..d3434b470c7543cebdd8c2e96a9bead7d3ce7abc 100644 (file)
--- a/src/lxc/lxc_freeze.c
+++ b/src/lxc/lxc_freeze.c
@@ -37,8 +37,8 @@ void usage(char *cmd)
 
 int main(int argc, char *argv[])
 {
-       char opt;
        char *name = NULL;
+       int opt;
        int nbargs = 0;
 
        while ((opt = getopt(argc, argv, "n:")) != -1) {

diff --git a/src/lxc/lxc_info.c b/src/lxc/lxc_info.c
index ce4c40c20df9c07e0fb227329661216e228ffb52..fd11239eb6bf8e6badc867006ce71685513c6657 100644 (file)
--- a/src/lxc/lxc_info.c
+++ b/src/lxc/lxc_info.c
@@ -36,9 +36,8 @@ void usage(char *cmd)
 
 int main(int argc, char *argv[])
 {
-       char opt;
        char *name = NULL;
-       int state, nbargs = 0;
+       int opt, state, nbargs = 0;
 
        while ((opt = getopt(argc, argv, "n:")) != -1) {
                switch (opt) {

diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c
index daae4807086fcc5ec2e323386ae221a53471c460..c4a433a3fd462309ff4787aa2dcef49a4f8e3925 100644 (file)
--- a/src/lxc/lxc_monitor.c
+++ b/src/lxc/lxc_monitor.c
@@ -38,11 +38,11 @@ void usage(char *cmd)
 
 int main(int argc, char *argv[])
 {
-       char opt, *name = NULL;
+       char *name = NULL;
        char *regexp;
        struct lxc_msg msg;
        regex_t preg;
-       int fd;
+       int fd, opt;
 
        while ((opt = getopt(argc, argv, "n:")) != -1) {
                switch (opt) {

diff --git a/src/lxc/lxc_priority.c b/src/lxc/lxc_priority.c
index 51edd17e2b3c27a66cfec745174a723f1522f77e..760979de1d6737b3dbb740009768e556f3092d9a 100644 (file)
--- a/src/lxc/lxc_priority.c
+++ b/src/lxc/lxc_priority.c
@@ -38,9 +38,8 @@ void usage(char *cmd)
 
 int main(int argc, char *argv[])
 {
-       char opt;
        char *name = NULL, *priority = NULL;
-       int prio, nbargs = 0;
+       int opt, prio, nbargs = 0;
 
        while ((opt = getopt(argc, argv, "p:n:")) != -1) {
                switch (opt) {

diff --git a/src/lxc/lxc_restart.c b/src/lxc/lxc_restart.c
index b586f0c0a0ba7f2bfdd1cf592d9f05e55a914e57..b5e615f615a72dd9f60f5bbcfaf0a7a81523d277 100644 (file)
--- a/src/lxc/lxc_restart.c
+++ b/src/lxc/lxc_restart.c
@@ -36,9 +36,8 @@ void usage(char *cmd)
 
 int main(int argc, char *argv[])
 {
-       char opt;
        char *name = NULL;
-       int nbargs = 0;
+       int opt, nbargs = 0;
 
        while ((opt = getopt(argc, argv, "n:")) != -1) {
                switch (opt) {

diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c
index ed7af47565201238464bcc72afae27b4e5168532..f33b1c4214874777e95e66d2491fa4af3645a032 100644 (file)
--- a/src/lxc/lxc_start.c
+++ b/src/lxc/lxc_start.c
@@ -45,10 +45,9 @@ void usage(char *cmd)
 
 int main(int argc, char *argv[])
 {
-       char opt;
        char *name = NULL;
        char **args;
-       int err = LXC_ERROR_INTERNAL, nbargs = 0;
+       int opt, err = LXC_ERROR_INTERNAL, nbargs = 0;
        struct termios tios;
 
        char *default_args[] = {

diff --git a/src/lxc/lxc_stop.c b/src/lxc/lxc_stop.c
index a63f800c104c3829f1cfc13499a0b58c298765b0..275d27d526d8b7a4ec0926fe337a3a2759bfcd12 100644 (file)
--- a/src/lxc/lxc_stop.c
+++ b/src/lxc/lxc_stop.c
@@ -36,9 +36,8 @@ void usage(char *cmd)
 
 int main(int argc, char *argv[])
 {
-       char opt;
        char *name = NULL;
-       int err, nbargs = 0;
+       int opt, err, nbargs = 0;
 
        while ((opt = getopt(argc, argv, "n:")) != -1) {
                switch (opt) {

diff --git a/src/lxc/lxc_unfreeze.c b/src/lxc/lxc_unfreeze.c
index d567310c2c46f5f24dad7a7387beb5515e2bc7a2..baa34271b90c9a6f71ede2e06a001e41e342adc3 100644 (file)
--- a/src/lxc/lxc_unfreeze.c
+++ b/src/lxc/lxc_unfreeze.c
@@ -36,9 +36,8 @@ void usage(char *cmd)
 
 int main(int argc, char *argv[])
 {
-       char opt;
        char *name = NULL;
-       int nbargs = 0;
+       int opt, nbargs = 0;
 
        while ((opt = getopt(argc, argv, "n:")) != -1) {
                switch (opt) {

diff --git a/src/lxc/lxc_unshare.c b/src/lxc/lxc_unshare.c
index 489ede0d5d5a5b6a2ffa0719010e6c300822332d..e9a81b93c7f652e742e9764b4ce6ec8bc1da402d 100644 (file)
--- a/src/lxc/lxc_unshare.c
+++ b/src/lxc/lxc_unshare.c
@@ -50,8 +50,8 @@ void usage(char *cmd)
 
 int main(int argc, char *argv[])
 {
-       int nbargs = 0, status = 1, hastofork = 0;
-       char **args, opt;
+       int opt, nbargs = 0, status = 1, hastofork = 0;
+       char **args;
        long flags = 0;
        uid_t uid;
        pid_t pid;

diff --git a/src/lxc/lxc_wait.c b/src/lxc/lxc_wait.c
index b5ea2f3fc7e1683785ddb0a441bceb22cd5ba5f0..7cf99a4787048d99f7a811135decccf64adabf84 100644 (file)
--- a/src/lxc/lxc_wait.c
+++ b/src/lxc/lxc_wait.c
@@ -58,9 +58,9 @@ static int fillwaitedstates(char *strstates, int *states)
 
 int main(int argc, char *argv[])
 {
-       char opt, *name = NULL, *states = NULL;
+       char *name = NULL, *states = NULL;
        struct lxc_msg msg;
-       int s[MAX_STATE] = { }, fd;
+       int s[MAX_STATE] = { }, fd, opt;
 
        while ((opt = getopt(argc, argv, "s:n:")) != -1) {
                switch (opt) {