Skip to content

L
lxc
Commit 9c9b9845 by Serge Hallyn Committed by Stéphane Graber
Options

check return values of scanf and system

Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com>
parent 733a0e89
Showing with 26 additions and 11 deletions
src/tests/startone.c
...@@ -144,7 +144,9 @@ int main(int argc, char *argv[]) ...@@ -144,7 +144,9 @@ int main(int argc, char *argv[])
printf("hit return to start container"); printf("hit return to start container");
char mychar; char mychar;
scanf("%c", &mychar); ret = scanf("%c", &mychar);
if (ret < 0)
goto out;
if (!lxc_container_get(c)) { if (!lxc_container_get(c)) {
fprintf(stderr, "%d: failed to get extra ref to container\n", __LINE__); fprintf(stderr, "%d: failed to get extra ref to container\n", __LINE__);
...@@ -171,20 +173,33 @@ int main(int argc, char *argv[]) ...@@ -171,20 +173,33 @@ int main(int argc, char *argv[])
} }
printf("hit return to finish"); printf("hit return to finish");
scanf("%c", &mychar); ret = scanf("%c", &mychar);
if (ret < 0)
goto out;
c->stop(c); c->stop(c);
system("mkdir -p /var/lib/lxc/lxctest1/rootfs//usr/local/libexec/lxc"); ret = system("mkdir -p /var/lib/lxc/lxctest1/rootfs//usr/local/libexec/lxc");
system("mkdir -p /var/lib/lxc/lxctest1/rootfs/usr/lib/lxc/"); if (!ret)
system("cp src/lxc/lxc-init /var/lib/lxc/lxctest1/rootfs//usr/local/libexec/lxc"); system("mkdir -p /var/lib/lxc/lxctest1/rootfs/usr/lib/lxc/");
system("cp src/lxc/liblxc.so /var/lib/lxc/lxctest1/rootfs/usr/lib/lxc"); if (!ret)
system("cp src/lxc/liblxc.so /var/lib/lxc/lxctest1/rootfs/usr/lib/lxc/liblxc.so.0"); ret = system("cp src/lxc/lxc-init /var/lib/lxc/lxctest1/rootfs//usr/local/libexec/lxc");
system("cp src/lxc/liblxc.so /var/lib/lxc/lxctest1/rootfs/usr/lib"); if (!ret)
system("mkdir -p /var/lib/lxc/lxctest1/rootfs/dev/shm"); ret = system("cp src/lxc/liblxc.so /var/lib/lxc/lxctest1/rootfs/usr/lib/lxc");
system("chroot /var/lib/lxc/lxctest1/rootfs apt-get install --no-install-recommends lxc"); if (!ret)
ret = system("cp src/lxc/liblxc.so /var/lib/lxc/lxctest1/rootfs/usr/lib/lxc/liblxc.so.0");
if (!ret)
ret = system("cp src/lxc/liblxc.so /var/lib/lxc/lxctest1/rootfs/usr/lib");
if (!ret)
ret = system("mkdir -p /var/lib/lxc/lxctest1/rootfs/dev/shm");
if (!ret)
ret = system("chroot /var/lib/lxc/lxctest1/rootfs apt-get install --no-install-recommends lxc");
if (ret) {
fprintf(stderr, "%d: failed to installing lxc-init in container\n", __LINE__);
goto out;
}
// next write out the config file; does it match? // next write out the config file; does it match?
if (!c->startl(c, 1, "/bin/hostname", NULL)) { if (!c->startl(c, 1, "/bin/hostname", NULL)) {
fprintf(stderr, "%d: failed to lxc-execute /bin/hostname", __LINE__); fprintf(stderr, "%d: failed to lxc-execute /bin/hostname\n", __LINE__);
goto out; goto out;
} }
// auto-check result? ('bobo' is printed on stdout) // auto-check result? ('bobo' is printed on stdout)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment