From: Enrico Scholz Date: Tue, 13 Jan 2004 14:56:26 +0000 (+0000) Subject: made it compilable with gcc296 X-Git-Tag: VERSION_0_10~957 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90ea9558c3d51f65b96228653fd54b8ba8604e48;p=util-vserver.git made it compilable with gcc296 git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@570 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/lib/getvserverbyctx.c b/util-vserver/lib/getvserverbyctx.c index ce45d43..e22e9ae 100644 --- a/util-vserver/lib/getvserverbyctx.c +++ b/util-vserver/lib/getvserverbyctx.c @@ -33,7 +33,7 @@ vc_getVserverByCtx(xid_t ctx, vcCfgStyle *style, char const *revdir) { if (revdir==0) revdir = DEFAULT_PKGSTATEREVDIR; - BS; + { vcCfgStyle cur_style = vcCFG_NONE; size_t l = strlen(revdir); size_t l1; @@ -63,5 +63,5 @@ vc_getVserverByCtx(xid_t ctx, vcCfgStyle *style, char const *revdir) default : return 0; } - BE; + } } diff --git a/util-vserver/lib/getvserverctx.c b/util-vserver/lib/getvserverctx.c index 71de198..b565e4e 100644 --- a/util-vserver/lib/getvserverctx.c +++ b/util-vserver/lib/getvserverctx.c @@ -45,7 +45,7 @@ getCtxFromFile(char const *pathname) (lseek(fd, 0, SEEK_SET)==-1)) return VC_NOCTX; - BS; + { char buf[len+1]; char *errptr; xid_t res; @@ -57,7 +57,7 @@ getCtxFromFile(char const *pathname) if (*errptr!='\0' && *errptr!='\n') return VC_NOCTX; return res; - BE; + } } xid_t diff --git a/util-vserver/src/exec-cd.c b/util-vserver/src/exec-cd.c index 2222d69..28cdd47 100644 --- a/util-vserver/src/exec-cd.c +++ b/util-vserver/src/exec-cd.c @@ -51,6 +51,7 @@ int main(int argc, char *argv[]) { int dirfd_root = Eopen("/", O_RDONLY, 0); int idx = 1; + int dirfd_cur; if (argc>=2) { if (strcmp(argv[1], "--help") ==0) showHelp(1, argv[0], 0); @@ -67,7 +68,7 @@ int main(int argc, char *argv[]) Echroot("."); Echdir(argv[idx]); - int dirfd_cur = Eopen(".", O_RDONLY, 0); + dirfd_cur = Eopen(".", O_RDONLY, 0); Efchdir(dirfd_root); Echroot("."); diff --git a/util-vserver/tests/escaperoot.c b/util-vserver/tests/escaperoot.c index 1e56544..3b1925f 100644 --- a/util-vserver/tests/escaperoot.c +++ b/util-vserver/tests/escaperoot.c @@ -67,10 +67,12 @@ static void test1() */ static void test2() { + int fd; + printf ("test2\n"); print_pwd(); mkdir ("dummy_dir",0755); - int fd = open (".",O_RDONLY); + fd = open (".",O_RDONLY); if (fd == -1){ fprintf (stderr,"Can't open current directory (%s)\n",strerror(errno)); }else if (chroot ("dummy_dir")==-1){ diff --git a/util-vserver/tests/testipc.c b/util-vserver/tests/testipc.c index 86fd0d6..331b69b 100644 --- a/util-vserver/tests/testipc.c +++ b/util-vserver/tests/testipc.c @@ -41,17 +41,18 @@ int main (int argc, char *argv[]) if (id == -1){ fprintf (stderr,"shmget failed (%s)\n",strerror(errno)); }else{ - printf ("shmget id %d\n",id); void *pt = shmat (id,NULL,0); + printf ("shmget id %d\n",id); if (pt == NULL){ fprintf (stderr,"can't shmat to id %d (%s)\n",id,strerror(errno)); }else{ + char tmp[100]; + int ok; strcpy ((char*)pt,"original string"); printf ("Letting a sub-program attach to this memory\n"); - char tmp[100]; sprintf (tmp,"./testipc accessshm %d",id); - int ok = system (tmp); + ok = system (tmp); printf ("\tSub-program returned %d\n",ok); printf ("\tThe segment now hold :%s:\n",(char*)pt); @@ -87,12 +88,13 @@ int main (int argc, char *argv[]) if (id == -1){ fprintf (stderr,"semget failed (%s)\n",strerror(errno)); }else{ + char tmp[100]; + int ok; printf ("semget id %d\n",id); printf ("Letting a sub-program play with this semaphore\n"); - char tmp[100]; sprintf (tmp,"./testipc accesssem %d",id); - int ok = system (tmp); + ok = system (tmp); printf ("\tSub-program returned %d\n",ok); printf ("A sub-program in another context can't use the semaphore\n"); diff --git a/util-vserver/tests/testlimit.c b/util-vserver/tests/testlimit.c index 7d90a1f..a1e0651 100644 --- a/util-vserver/tests/testlimit.c +++ b/util-vserver/tests/testlimit.c @@ -32,6 +32,7 @@ int main (int argc, char *argv[]) int nbproc = atoi(argv[1]); int size = atoi(argv[2]); int i; + int status; for (i=0; i