The following commit has been merged in the master branch:
commit 133bc9b2039b1804ff291aefd595ade7b8317741
Author: Guillem Jover <guil...@debian.org>
Date: Tue Jun 16 22:05:09 2009 +0200
Move statoverride db parsing into a new file
diff --git a/src/Makefile.am b/src/Makefile.am
index cb3ec93..19d864c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,6 +18,7 @@ dpkg_SOURCES = \
enquiry.c \
errors.c \
filesdb.c filesdb.h \
+ statdb.c \
help.c \
main.c main.h \
packages.c \
diff --git a/src/filesdb.c b/src/filesdb.c
index baee5f2..0529c67 100644
--- a/src/filesdb.c
+++ b/src/filesdb.c
@@ -50,7 +50,6 @@ static int allpackagesdone= 0;
static int nfiles= 0;
static struct diversion *diversions = NULL;
static FILE *diversionsfile = NULL;
-static FILE *statoverridefile = NULL;
void
ensure_package_clientdata(struct pkginfo *pkg)
@@ -334,132 +333,6 @@ void reversefilelist_abort(struct reversefilelistiter
*iterptr) {
while (reversefilelist_next(iterptr));
}
-void ensure_statoverrides(void) {
- static struct varbuf vb;
-
- struct stat stab1, stab2;
- FILE *file;
- char *loaded_list, *loaded_list_end, *thisline, *nextline, *ptr;
- struct filestatoverride *fso;
- struct filenamenode *fnn;
-
- varbufreset(&vb);
- varbufaddstr(&vb,admindir);
- varbufaddstr(&vb,"/" STATOVERRIDEFILE);
- varbufaddc(&vb,0);
-
- onerr_abort++;
-
- file= fopen(vb.buf,"r");
- if (!file) {
- if (errno != ENOENT) ohshite(_("failed to open statoverride file"));
- if (!statoverridefile) { onerr_abort--; return; }
- } else {
- if (fstat(fileno(file),&stab2))
- ohshite(_("failed to fstat statoverride file"));
- if (statoverridefile) {
- if (fstat(fileno(statoverridefile),&stab1))
- ohshite(_("failed to fstat previous statoverride file"));
- if (stab1.st_dev == stab2.st_dev && stab1.st_ino == stab2.st_ino) {
- fclose(file); onerr_abort--; return;
- }
- }
- }
- if (statoverridefile) fclose(statoverridefile);
- statoverridefile= file;
- setcloexec(fileno(statoverridefile), vb.buf);
-
- /* If the statoverride list is empty we don't need to bother reading it. */
- if (!stab2.st_size) {
- onerr_abort--;
- return;
- }
-
- loaded_list = nfmalloc(stab2.st_size);
- loaded_list_end = loaded_list + stab2.st_size;
-
- fd_buf_copy(fileno(file), loaded_list, stab2.st_size, _("statoverride file
`%.250s'"), vb.buf);
-
- thisline = loaded_list;
- while (thisline<loaded_list_end) {
- char* endptr;
-
- fso= nfmalloc(sizeof(struct filestatoverride));
-
- if (!(ptr = memchr(thisline, '\n', loaded_list_end - thisline)))
- ohshit(_("statoverride file is missing final newline"));
- /* where to start next time around */
- nextline = ptr + 1;
- if (ptr == thisline)
- ohshit(_("statoverride file contains empty line"));
- *ptr = 0;
-
- /* Extract the uid */
- if (!(ptr=memchr(thisline, ' ', nextline-thisline)))
- ohshit(_("syntax error in statoverride file"));
- *ptr=0;
- if (thisline[0]=='#') {
- fso->uid=strtol(thisline + 1, &endptr, 10);
- if (thisline + 1 == endptr || *endptr)
- ohshit(_("syntax error: invalid uid in statoverride file"));
- } else {
- struct passwd* pw = getpwnam(thisline);
- if (pw==NULL)
- ohshit(_("syntax error: unknown user '%s' in statoverride file"),
- thisline);
- fso->uid=pw->pw_uid;
- }
-
- /* Move to the next bit */
- thisline=ptr+1;
- if (thisline>=loaded_list_end)
- ohshit(_("unexpected end of line in statoverride file"));
-
- /* Extract the gid */
- if (!(ptr=memchr(thisline, ' ', nextline-thisline)))
- ohshit(_("syntax error in statoverride file"));
- *ptr=0;
- if (thisline[0]=='#') {
- fso->gid=strtol(thisline + 1, &endptr, 10);
- if (thisline + 1 == endptr || *endptr)
- ohshit(_("syntax error: invalid gid in statoverride file"));
- } else {
- struct group* gr = getgrnam(thisline);
- if (gr==NULL)
- ohshit(_("syntax error: unknown group '%s' in statoverride file"),
- thisline);
- fso->gid=gr->gr_gid;
- }
-
- /* Move to the next bit */
- thisline=ptr+1;
- if (thisline>=loaded_list_end)
- ohshit(_("unexpected end of line in statoverride file"));
-
- /* Extract the mode */
- if (!(ptr=memchr(thisline, ' ', nextline-thisline)))
- ohshit(_("syntax error in statoverride file"));
- *ptr=0;
- fso->mode=strtol(thisline, &endptr, 8);
- if (thisline == endptr || *endptr)
- ohshit(_("syntax error: invalid mode in statoverride file"));
-
- /* Move to the next bit */
- thisline=ptr+1;
- if (thisline>=loaded_list_end)
- ohshit(_("unexpected end of line in statoverride file"));
-
- fnn= findnamenode(thisline, 0);
- if (fnn->statoverride)
- ohshit(_("multiple statusoverides present for file '%.250s'"), thisline);
- fnn->statoverride=fso;
- /* Moving on.. */
- thisline=nextline;
- }
-
- onerr_abort--;
-}
-
void ensure_diversions(void) {
static struct varbuf vb;
diff --git a/src/statdb.c b/src/statdb.c
new file mode 100644
index 0000000..a2a55f0
--- /dev/null
+++ b/src/statdb.c
@@ -0,0 +1,188 @@
+/*
+ * dpkg - main program for package management
+ * statdb.c - management of database of ownership and mode of files
+ *
+ * Copyright © 1995 Ian Jackson <i...@chiark.greenend.org.uk>
+ * Copyright © 2000, 2001 Wichert Akkerman <wakke...@debian.org>
+ *
+ * This 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; either version 2,
+ * or (at your option) any later version.
+ *
+ * This 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 dpkg; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <dpkg-i18n.h>
+
+#include <assert.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+#include <pwd.h>
+#include <grp.h>
+#include <sys/types.h>
+
+#include <dpkg.h>
+#include <dpkg-db.h>
+#include <dpkg-priv.h>
+
+#include "filesdb.h"
+#include "main.h"
+
+static FILE *statoverridefile = NULL;
+
+void
+ensure_statoverrides(void)
+{
+ static struct varbuf vb;
+
+ struct stat stab1, stab2;
+ FILE *file;
+ char *loaded_list, *loaded_list_end, *thisline, *nextline, *ptr;
+ struct filestatoverride *fso;
+ struct filenamenode *fnn;
+
+ varbufreset(&vb);
+ varbufaddstr(&vb, admindir);
+ varbufaddstr(&vb, "/" STATOVERRIDEFILE);
+ varbufaddc(&vb, 0);
+
+ onerr_abort++;
+
+ file = fopen(vb.buf,"r");
+ if (!file) {
+ if (errno != ENOENT)
+ ohshite(_("failed to open statoverride file"));
+ if (!statoverridefile) {
+ onerr_abort--;
+ return;
+ }
+ } else {
+ if (fstat(fileno(file), &stab2))
+ ohshite(_("failed to fstat statoverride file"));
+ if (statoverridefile) {
+ if (fstat(fileno(statoverridefile), &stab1))
+ ohshite(_("failed to fstat previous
statoverride file"));
+ if (stab1.st_dev == stab2.st_dev &&
+ stab1.st_ino == stab2.st_ino) {
+ fclose(file);
+ onerr_abort--;
+ return;
+ }
+ }
+ }
+ if (statoverridefile)
+ fclose(statoverridefile);
+ statoverridefile = file;
+ setcloexec(fileno(statoverridefile), vb.buf);
+
+ /* If the statoverride list is empty we don't need to bother
+ * reading it. */
+ if (!stab2.st_size) {
+ onerr_abort--;
+ return;
+ }
+
+ loaded_list = nfmalloc(stab2.st_size);
+ loaded_list_end = loaded_list + stab2.st_size;
+
+ fd_buf_copy(fileno(file), loaded_list, stab2.st_size,
+ _("statoverride file `%.250s'"), vb.buf);
+
+ thisline = loaded_list;
+ while (thisline < loaded_list_end) {
+ char* endptr;
+
+ fso = nfmalloc(sizeof(struct filestatoverride));
+
+ if (!(ptr = memchr(thisline, '\n', loaded_list_end - thisline)))
+ ohshit(_("statoverride file is missing final newline"));
+ /* Where to start next time around. */
+ nextline = ptr + 1;
+ if (ptr == thisline)
+ ohshit(_("statoverride file contains empty line"));
+ *ptr = 0;
+
+ /* Extract the uid. */
+ if (!(ptr = memchr(thisline, ' ', nextline - thisline)))
+ ohshit(_("syntax error in statoverride file"));
+ *ptr = 0;
+ if (thisline[0] == '#') {
+ fso->uid = strtol(thisline + 1, &endptr, 10);
+ if (thisline + 1 == endptr || *endptr)
+ ohshit(_("syntax error: invalid uid in
statoverride file"));
+ } else {
+ struct passwd* pw = getpwnam(thisline);
+ if (pw == NULL)
+ ohshit(_("syntax error: unknown user '%s' in
statoverride file"),
+ thisline);
+ fso->uid = pw->pw_uid;
+ }
+
+ /* Move to the next bit */
+ thisline = ptr + 1;
+ if (thisline >= loaded_list_end)
+ ohshit(_("unexpected end of line in statoverride
file"));
+
+ /* Extract the gid */
+ if (!(ptr = memchr(thisline, ' ', nextline - thisline)))
+ ohshit(_("syntax error in statoverride file"));
+ *ptr = 0;
+ if (thisline[0] == '#') {
+ fso->gid = strtol(thisline + 1, &endptr, 10);
+ if (thisline + 1 == endptr || *endptr)
+ ohshit(_("syntax error: invalid gid in
statoverride file"));
+ } else {
+ struct group* gr = getgrnam(thisline);
+ if (gr == NULL)
+ ohshit(_("syntax error: unknown group '%s' in
statoverride file"),
+ thisline);
+ fso->gid = gr->gr_gid;
+ }
+
+ /* Move to the next bit */
+ thisline = ptr + 1;
+ if (thisline >= loaded_list_end)
+ ohshit(_("unexpected end of line in statoverride
file"));
+
+ /* Extract the mode */
+ if (!(ptr = memchr(thisline, ' ', nextline - thisline)))
+ ohshit(_("syntax error in statoverride file"));
+ *ptr = 0;
+ fso->mode = strtol(thisline, &endptr, 8);
+ if (thisline == endptr || *endptr)
+ ohshit(_("syntax error: invalid mode in statoverride
file"));
+
+ /* Move to the next bit */
+ thisline = ptr + 1;
+ if (thisline >= loaded_list_end)
+ ohshit(_("unexecpted end of line in statoverride
file"));
+
+ fnn = findnamenode(thisline, 0);
+ if (fnn->statoverride)
+ ohshit(_("multiple statusoverides present for file
'%.250s'"),
+ thisline);
+ fnn->statoverride = fso;
+
+ /* Moving on.. */
+ thisline = nextline;
+ }
+
+ onerr_abort--;
+}
+
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
