X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib_internal%2Fmatchlist-initmanually.c;h=1907d3b7ae9554c4cb46493213aefab9cc8adfdf;hb=HEAD;hp=4be43fde6370ecce2bf3ace9bd2c9e5e54b3030e;hpb=8017c61604996d3adcab25cc544427945c903373;p=util-vserver.git diff --git a/lib_internal/matchlist-initmanually.c b/lib_internal/matchlist-initmanually.c index 4be43fd..1907d3b 100644 --- a/lib_internal/matchlist-initmanually.c +++ b/lib_internal/matchlist-initmanually.c @@ -1,16 +1,16 @@ // $Id$ --*- c -*-- // Copyright (C) 2004 Enrico Scholz -// +// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation; version 2 of the License. -// +// // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -48,7 +48,7 @@ readExcludeListFD(int fd, off_t len; size_t lines = 0; char *ptr; - + if (fd==-1) return; // todo: message on verbose? len = Elseek(fd, 0, SEEK_END); @@ -80,7 +80,7 @@ readExcludeListFD(int fd, do { *tmp-- = '\0'; } while (tmp>ptr && *tmp==' '); - + if (tmp>ptr) (*files)[(*size)++] = ptr; } @@ -105,7 +105,7 @@ getConfigfileList(char const *vserver, char const ***files, size_t *size, char **buf) { - char tmpname[] = "/tmp/vunify.XXXXXX"; + char tmpname[] = "/tmp/vunify.XXXXXX"; pid_t pid; int fd = Emkstemp(tmpname); @@ -115,7 +115,7 @@ getConfigfileList(char const *vserver, if (pid==0) { char *args[10]; char const **ptr = (char const **)(args)+0; - + Edup2(fd, 1); //Eclose(0); if (fd!=1) Eclose(fd); @@ -129,7 +129,7 @@ getConfigfileList(char const *vserver, } else { int status; - + if (TEMP_FAILURE_RETRY(wait4(pid, &status, 0,0))==-1) { perror("wait4()"); exit(1); @@ -151,7 +151,7 @@ MatchList_initManually(struct MatchList *list, char const *vdir, char const *exclude_file) { char *buf[2] = { 0,0 }; - + char const **fixed_files = 0; size_t fixed_count = 0; @@ -167,7 +167,7 @@ MatchList_initManually(struct MatchList *list, } else len = strlen(vdir); - + if (Global_getVerbosity()>=1) { WRITE_MSG(1, "Initializing exclude-list for "); Vwrite(1, vdir, len);