From: dlezcano <dlezcano>
Date: Mon, 26 Jan 2009 19:43:46 +0000 (+0000)
Subject: Fixed bad variable type
X-Git-Tag: lxc_0_6_0~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64870cda2a584784a6bdb75a989c97a2444678c8;p=thirdparty%2Flxc.git

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 fe901fafa..db4018ac9 100644
--- 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 5a412cadb..721fdd3ad 100644
--- 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 480ffba79..7d4aa3b3a 100644
--- 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 6a9881a4f..6d5aef0ae 100644
--- 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 012c0a8aa..1964a06cc 100644
--- 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 12d15c34d..362c03e55 100644
--- 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 06d5a53b3..d3434b470 100644
--- 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 ce4c40c20..fd11239eb 100644
--- 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 daae48070..c4a433a3f 100644
--- 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 51edd17e2..760979de1 100644
--- 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 b586f0c0a..b5e615f61 100644
--- 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 ed7af4756..f33b1c421 100644
--- 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 a63f800c1..275d27d52 100644
--- 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 d567310c2..baa34271b 100644
--- 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 489ede0d5..e9a81b93c 100644
--- 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 b5ea2f3fc..7cf99a478 100644
--- 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) {