Changeset 2608
- Timestamp:
- 09/03/07 09:42:17 (1 year ago)
- Files:
-
- trunk/lib_internal/matchlist-appendfiles.c (modified) (2 diffs)
- trunk/lib_internal/matchlist-initmanually.c (modified) (8 diffs)
- trunk/lib_internal/matchlist.h (modified) (2 diffs)
- trunk/lib_internal/util-safechdir.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib_internal/matchlist-appendfiles.c
r2607 r2608 2 2 3 3 // Copyright (C) 2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> 4 // 4 // 5 5 // This program is free software; you can redistribute it and/or modify 6 6 // it under the terms of the GNU General Public License as published by 7 7 // the Free Software Foundation; version 2 of the License. 8 // 8 // 9 9 // This program is distributed in the hope that it will be useful, 10 10 // but WITHOUT ANY WARRANTY; without even the implied warranty of 11 11 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 12 // GNU General Public License for more details. 13 // 13 // 14 14 // You should have received a copy of the GNU General Public License 15 15 // along with this program; if not, write to the Free Software … … 44 44 struct MatchItem *ptr = list->data + idx; 45 45 size_t i; 46 46 47 47 assert(idx+count <= list->count); 48 48 trunk/lib_internal/matchlist-initmanually.c
r2607 r2608 2 2 3 3 // Copyright (C) 2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> 4 // 4 // 5 5 // This program is free software; you can redistribute it and/or modify 6 6 // it under the terms of the GNU General Public License as published by 7 7 // the Free Software Foundation; version 2 of the License. 8 // 8 // 9 9 // This program is distributed in the hope that it will be useful, 10 10 // but WITHOUT ANY WARRANTY; without even the implied warranty of 11 11 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 12 // GNU General Public License for more details. 13 // 13 // 14 14 // You should have received a copy of the GNU General Public License 15 15 // along with this program; if not, write to the Free Software … … 49 49 size_t lines = 0; 50 50 char *ptr; 51 51 52 52 if (fd==-1) return; // todo: message on verbose? 53 53 … … 81 81 *tmp-- = '\0'; 82 82 } while (tmp>ptr && *tmp==' '); 83 83 84 84 if (tmp>ptr) (*files)[(*size)++] = ptr; 85 85 } … … 106 106 char **buf) 107 107 { 108 char tmpname[] = "/tmp/vunify.XXXXXX";108 char tmpname[] = "/tmp/vunify.XXXXXX"; 109 109 pid_t pid; 110 110 int fd = Emkstemp(tmpname); … … 116 116 char *args[10]; 117 117 char const **ptr = (char const **)(args)+0; 118 118 119 119 Edup2(fd, 1); 120 120 //Eclose(0); … … 130 130 else { 131 131 int status; 132 132 133 133 if (TEMP_FAILURE_RETRY(wait4(pid, &status, 0,0))==-1) { 134 134 perror("wait4()"); … … 152 152 { 153 153 char *buf[2] = { 0,0 }; 154 154 155 155 char const **fixed_files = 0; 156 156 size_t fixed_count = 0; … … 168 168 else 169 169 len = strlen(vdir); 170 170 171 171 if (Global_getVerbosity()>=1) { 172 172 WRITE_MSG(1, "Initializing exclude-list for "); trunk/lib_internal/matchlist.h
r2607 r2608 2 2 3 3 // Copyright (C) 2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> 4 // 4 // 5 5 // This program is free software; you can redistribute it and/or modify 6 6 // it under the terms of the GNU General Public License as published by 7 7 // the Free Software Foundation; version 2 of the License. 8 // 8 // 9 9 // This program is distributed in the hope that it will be useful, 10 10 // but WITHOUT ANY WARRANTY; without even the implied warranty of 11 11 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 12 // GNU General Public License for more details. 13 // 13 // 14 14 // You should have received a copy of the GNU General Public License 15 15 // along with this program; if not, write to the Free Software … … 53 53 struct MatchVserverInfo 54 54 { 55 char const *name;55 char const *name; 56 56 57 57 vcCfgStyle style; 58 58 PathInfo vdir; 59 59 PathInfo appdir; 60 60 61 61 bool use_pkgmgmt; 62 62 }; trunk/lib_internal/util-safechdir.h
r2606 r2608 2 2 3 3 // Copyright (C) 2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> 4 // 4 // 5 5 // This program is free software; you can redistribute it and/or modify 6 6 // it under the terms of the GNU General Public License as published by 7 7 // the Free Software Foundation; version 2 of the License. 8 // 8 // 9 9 // This program is distributed in the hope that it will be useful, 10 10 // but WITHOUT ANY WARRANTY; without even the implied warranty of 11 11 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 12 // GNU General Public License for more details. 13 // 13 // 14 14 // You should have received a copy of the GNU General Public License 15 15 // along with this program; if not, write to the Free Software
