From: jbj Date: Sun, 23 Jan 2005 20:44:57 +0000 (+0000) Subject: - blueprint rpm-4_4 and HEAD to minimize diff spew. X-Git-Tag: rpm-4.4.1-release~24 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9e1bfe0af5fd0183f882f60ebbb670f867682425;p=platform%2Fupstream%2Frpm.git - blueprint rpm-4_4 and HEAD to minimize diff spew. CVS patchset: 7706 CVS date: 2005/01/23 20:44:57 --- diff --git a/CHANGES b/CHANGES index 5307e49..dcfff8a 100644 --- a/CHANGES +++ b/CHANGES @@ -9,7 +9,9 @@ - mac os x patches (#131943,#131944,#132924,#132926). - mac os x patches (#133611, #133612, #134637). - build against external/internal neon. + - add https://svn.uhulinux.hu/packages/dev/zlib/patches/02-rsync.patch - changes to build on Mac OS X using darwinports neon/beecrypt. + - blueprint rpm-4_4 and HEAD to minimize diff spew. 4.3.3 -> 4.4: - pentium3/pentium4 arch support (pluto@PLD). diff --git a/autogen.sh b/autogen.sh index c5061ad..518c9f6 100755 --- a/autogen.sh +++ b/autogen.sh @@ -50,6 +50,9 @@ fi if [ -d file ]; then (echo "--- file"; cd file; ./autogen.sh --noconfigure "$@") fi +if [ -d neon ]; then + (echo "--- neon"; cd neon; ./autogen.sh "$@") +fi echo "--- rpm" $libtoolize --copy --force diff --git a/configure.ac b/configure.ac index 20105c2..b69356a 100644 --- a/configure.ac +++ b/configure.ac @@ -454,6 +454,9 @@ AC_CHECK_HEADER([neon/ne_session.h], [ AC_CHECK_LIB(neon, ne_get_response_header, [ AC_DEFINE(HAVE_NEON_NE_GET_RESPONSE_HEADER, 1, [Define to 1 if you have ne_get_response_header() in libneon.]) ]) + AC_CHECK_LIB(neon, ne_send_request_chunk, [ + AC_DEFINE(HAVE_NEON_NE_SEND_REQUEST_CHUNK, 1, [Define to 1 if you have ne_send_request_chunk() in libneon.]) + ]) WITH_NEON_INCLUDE="-I${includedir}/neon" WITH_NEON_LIB="-lneon" ]) diff --git a/file/src/.splintrc b/file/src/.splintrc index 9f1cae6..fbbb555 100644 --- a/file/src/.splintrc +++ b/file/src/.splintrc @@ -20,7 +20,6 @@ -compmempass -compdestroy -evalorder --exitarg -formatconst -macroredef -modobserver # 9 @@ -42,11 +41,6 @@ -temptrans --looploopbreak --loopswitchbreak --looploopcontinue --switchloopbreak --switchswitchbreak -whileempty -constuse diff --git a/file/src/Makefile.am b/file/src/Makefile.am index f1ac1af..076ffc3 100644 --- a/file/src/Makefile.am +++ b/file/src/Makefile.am @@ -4,7 +4,7 @@ BUILT_SOURCES = listobjs EXTRA_DIST = test.c pkglibdir = @prefix@/lib/rpm -#MAGIC = $(pkglibdir)/magic +MAGIC = $(pkglibdir)/magic AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"' diff --git a/file/src/apprentice.c b/file/src/apprentice.c index 31d94ab..b1ad3fe 100644 --- a/file/src/apprentice.c +++ b/file/src/apprentice.c @@ -667,14 +667,14 @@ parse(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp, char *l, switch (*l) { case CHAR_IGNORE_LOWERCASE: m->mask |= STRING_IGNORE_LOWERCASE; - break; + /*@switchbreak@*/ break; case CHAR_COMPACT_BLANK: m->mask |= STRING_COMPACT_BLANK; - break; + /*@switchbreak@*/ break; case CHAR_COMPACT_OPTIONAL_BLANK: m->mask |= STRING_COMPACT_OPTIONAL_BLANK; - break; + /*@switchbreak@*/ break; default: if (ms->flags & MAGIC_CHECK) file_magwarn(ms, @@ -881,31 +881,31 @@ getstr(struct magic_set *ms, char *s, char *p, int plen, int *slen) default: *p++ = (char) c; - break; + /*@switchbreak@*/ break; case 'n': *p++ = '\n'; - break; + /*@switchbreak@*/ break; case 'r': *p++ = '\r'; - break; + /*@switchbreak@*/ break; case 'b': *p++ = '\b'; - break; + /*@switchbreak@*/ break; case 't': *p++ = '\t'; - break; + /*@switchbreak@*/ break; case 'f': *p++ = '\f'; - break; + /*@switchbreak@*/ break; case 'v': *p++ = '\v'; - break; + /*@switchbreak@*/ break; /* \ and up to 3 octal digits */ case '0': @@ -929,7 +929,7 @@ getstr(struct magic_set *ms, char *s, char *p, int plen, int *slen) else --s; *p++ = (char)val; - break; + /*@switchbreak@*/ break; /* \x and up to 2 hex digits */ case 'x': @@ -945,7 +945,7 @@ getstr(struct magic_set *ms, char *s, char *p, int plen, int *slen) } else --s; *p++ = (char)val; - break; + /*@switchbreak@*/ break; } } else *p++ = (char)c; @@ -999,31 +999,31 @@ file_showstr(FILE *fp, const char *s, size_t len) case '\n': (void) fputc('n', fp); - break; + /*@switchbreak@*/ break; case '\r': (void) fputc('r', fp); - break; + /*@switchbreak@*/ break; case '\b': (void) fputc('b', fp); - break; + /*@switchbreak@*/ break; case '\t': (void) fputc('t', fp); - break; + /*@switchbreak@*/ break; case '\f': (void) fputc('f', fp); - break; + /*@switchbreak@*/ break; case '\v': (void) fputc('v', fp); - break; + /*@switchbreak@*/ break; default: (void) fprintf(fp, "%.3o", c & 0377); - break; + /*@switchbreak@*/ break; } } } diff --git a/file/src/ascmagic.c b/file/src/ascmagic.c index e1d5bc3..ad48965 100644 --- a/file/src/ascmagic.c +++ b/file/src/ascmagic.c @@ -208,7 +208,7 @@ file_ascmagic(struct magic_set *ms, const unsigned char *buf, size_t nbytes) */ for (end = i + 1; end < nbytes; end++) if (ISSPC(ubuf[end])) - break; + /*@innerbreak@*/ break; /* * compare the word thus isolated against the token list diff --git a/file/src/compress.c b/file/src/compress.c index 06e8ae7..51437ce 100644 --- a/file/src/compress.c +++ b/file/src/compress.c @@ -149,7 +149,7 @@ swrite(int fd, const void *buf, size_t n) default: n -= rv; buf = ((const char *)buf) + rv; - break; + /*@switchbreak@*/ break; } while (n > 0); return rn; @@ -176,7 +176,7 @@ sread(int fd, void *buf, size_t n) default: n -= rv; buf = ((char *)buf) + rv; - break; + /*@switchbreak@*/ break; } while (n > 0); return rn; @@ -354,7 +354,7 @@ uncompressbuf(struct magic_set *ms, size_t method, const unsigned char *old, execvp(compr[method].argv[0], (char *const *)compr[method].argv); - exit(1); + exit(EXIT_FAILURE); /*@notreached@*/ break; case -1: file_error(ms, errno, "could not fork"); @@ -368,16 +368,16 @@ uncompressbuf(struct magic_set *ms, size_t method, const unsigned char *old, case 0: /* child */ (void)close(fdout[0]); if (swrite(fdin[1], old, n) != n) - exit(1); - exit(0); - /*@notreached@*/ break; + exit(EXIT_FAILURE); + exit(EXIT_SUCCESS); + /*@notreached@*/ /*@innerbreak@*/ break; case -1: - exit(1); - /*@notreached@*/ break; + exit(EXIT_FAILURE); + /*@notreached@*/ /*@innerbreak@*/ break; default: /* parent */ - break; + /*@innerbreak@*/ break; } (void) close(fdin[1]); fdin[1] = -1; diff --git a/file/src/file.c b/file/src/file.c index 425b82b..fb47ef3 100644 --- a/file/src/file.c +++ b/file/src/file.c @@ -226,56 +226,56 @@ main(int argc, char *argv[]) case 0 : if (longindex == 1) help(); - break; + /*@switchbreak@*/ break; #endif case 'b': ++bflag; - break; + /*@switchbreak@*/ break; case 'c': action = FILE_CHECK; - break; + /*@switchbreak@*/ break; case 'C': action = FILE_COMPILE; - break; + /*@switchbreak@*/ break; case 'd': flags |= MAGIC_DEBUG|MAGIC_CHECK; - break; + /*@switchbreak@*/ break; case 'f': if(action) usage(); load(magicfile, flags); unwrap(optarg); ++didsomefiles; - break; + /*@switchbreak@*/ break; case 'F': separator = optarg; - break; + /*@switchbreak@*/ break; case 'i': flags |= MAGIC_MIME; - break; + /*@switchbreak@*/ break; case 'k': flags |= MAGIC_CONTINUE; - break; + /*@switchbreak@*/ break; case 'm': magicfile = optarg; - break; + /*@switchbreak@*/ break; case 'n': ++nobuffer; - break; + /*@switchbreak@*/ break; case 'N': ++nopad; - break; + /*@switchbreak@*/ break; #if defined(HAVE_UTIME) || defined(HAVE_UTIMES) case 'p': flags |= MAGIC_PRESERVE_ATIME; - break; + /*@switchbreak@*/ break; #endif case 'r': flags |= MAGIC_RAW; - break; + /*@switchbreak@*/ break; case 's': flags |= MAGIC_DEVICES; - break; + /*@switchbreak@*/ break; case 'v': (void) fprintf(stdout, "%s-%d.%.2d\n", progname, FILE_VERSION_MAJOR, patchlevel); @@ -284,16 +284,16 @@ main(int argc, char *argv[]) return 1; case 'z': flags |= MAGIC_COMPRESS; - break; + /*@switchbreak@*/ break; #ifdef S_IFLNK case 'L': flags |= MAGIC_SYMLINK; - break; + /*@switchbreak@*/ break; #endif case '?': default: errflg++; - break; + /*@switchbreak@*/ break; } if (errflg) { @@ -352,12 +352,12 @@ load(/*@unused@*/ const char *m, int flags) magic = magic_open(flags); if (magic == NULL) { (void)fprintf(stderr, "%s: %s\n", progname, strerror(errno)); - exit(1); + exit(EXIT_FAILURE); } if (magic_load(magic, magicfile) == -1) { (void)fprintf(stderr, "%s: %s\n", progname, magic_error(magic)); - exit(1); + exit(EXIT_FAILURE); } } @@ -378,7 +378,7 @@ unwrap(char *fn) if ((f = fopen(fn, "r")) == NULL) { (void)fprintf(stderr, "%s: Cannot open `%s' (%s).\n", progname, fn, strerror(errno)); - exit(1); + exit(EXIT_FAILURE); } while (fgets(buf, MAXPATHLEN, f) != NULL) { @@ -517,7 +517,7 @@ usage(void) #ifdef HAVE_GETOPT_LONG (void)fputs("Try `file --help' for more information.\n", stderr); #endif - exit(1); + exit(EXIT_FAILURE); } #ifdef HAVE_GETOPT_LONG @@ -549,6 +549,6 @@ help(void) " --help display this help and exit\n" " --version output version information and exit\n" ); - exit(0); + exit(EXIT_SUCCESS); } #endif diff --git a/file/src/readelf.c b/file/src/readelf.c index cd20bed..5272631 100644 --- a/file/src/readelf.c +++ b/file/src/readelf.c @@ -273,11 +273,11 @@ dophn_core(struct magic_set *ms, int class, int swap, int fd, off_t off, offset = 0; for (;;) { if (offset >= (size_t)bufsize) - break; + /*@innerbreak@*/ break; offset = donote(ms, nbuf, offset, (size_t)bufsize, class, swap, 4); if (offset == 0) - break; + /*@innerbreak@*/ break; } } @@ -595,7 +595,7 @@ donote(struct magic_set *ms, unsigned char *nbuf, size_t offset, size_t size, if (j == 0) goto tryanother; else - break; + /*@innerbreak@*/ break; } else { /* * A nonprintable @@ -700,10 +700,10 @@ dophn_exec(struct magic_set *ms, int class, int swap, int fd, off_t off, switch (ph_type) { case PT_DYNAMIC: linking_style = "dynamically"; - break; + /*@switchbreak@*/ break; case PT_INTERP: shared_libraries = " (uses shared libs)"; - break; + /*@switchbreak@*/ break; case PT_NOTE: if ((align = ph_align) & 0x80000000) { if (file_printf(ms, @@ -730,17 +730,17 @@ dophn_exec(struct magic_set *ms, int class, int swap, int fd, off_t off, offset = 0; for (;;) { if (offset >= (size_t)bufsize) - break; + /*@innerbreak@*/ break; offset = donote(ms, nbuf, offset, (size_t)bufsize, class, swap, align); if (offset == 0) - break; + /*@innerbreak@*/ break; } if (lseek(fd, savedoffset, SEEK_SET) == (off_t)-1) { file_badseek(ms); return -1; } - break; + /*@switchbreak@*/ break; } } if (file_printf(ms, ", %s linked%s", linking_style, shared_libraries) diff --git a/file/src/softmagic.c b/file/src/softmagic.c index 82bc729..707b1c5 100644 --- a/file/src/softmagic.c +++ b/file/src/softmagic.c @@ -134,9 +134,9 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic, return -1; case 0: flush++; - break; + /*@switchbreak@*/ break; default: - break; + /*@switchbreak@*/ break; } if (flush) { /* @@ -171,7 +171,7 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic, while (magic[magindex+1].cont_level != 0 && ++magindex < nmagic) { if (cont_level < magic[magindex].cont_level) - continue; + /*@innercontinue@*/ continue; if (cont_level > magic[magindex].cont_level) { /* * We're at the end of the level @@ -190,7 +190,7 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic, case -1: return -1; case 0: - break; + /*@switchbreak@*/ break; default: /* * This continuation matched. @@ -347,28 +347,28 @@ mconvert(struct magic_set *ms, union VALUETYPE *p, struct magic *m) switch (m->mask_op&0x7F) { case FILE_OPAND: p->b &= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPOR: p->b |= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPXOR: p->b ^= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPADD: p->b += m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPMINUS: p->b -= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPMULTIPLY: p->b *= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPDIVIDE: p->b /= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPMODULO: p->b %= m->mask; - break; + /*@innerbreak@*/ break; } if (m->mask_op & FILE_OPINVERSE) p->b = ~p->b; @@ -378,28 +378,28 @@ mconvert(struct magic_set *ms, union VALUETYPE *p, struct magic *m) switch (m->mask_op&0x7F) { case FILE_OPAND: p->h &= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPOR: p->h |= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPXOR: p->h ^= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPADD: p->h += m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPMINUS: p->h -= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPMULTIPLY: p->h *= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPDIVIDE: p->h /= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPMODULO: p->h %= m->mask; - break; + /*@innerbreak@*/ break; } if (m->mask_op & FILE_OPINVERSE) p->h = ~p->h; @@ -411,28 +411,28 @@ mconvert(struct magic_set *ms, union VALUETYPE *p, struct magic *m) switch (m->mask_op&0x7F) { case FILE_OPAND: p->l &= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPOR: p->l |= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPXOR: p->l ^= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPADD: p->l += m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPMINUS: p->l -= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPMULTIPLY: p->l *= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPDIVIDE: p->l /= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPMODULO: p->l %= m->mask; - break; + /*@innerbreak@*/ break; } if (m->mask_op & FILE_OPINVERSE) p->l = ~p->l; @@ -470,28 +470,28 @@ mconvert(struct magic_set *ms, union VALUETYPE *p, struct magic *m) switch (m->mask_op&0x7F) { case FILE_OPAND: p->h &= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPOR: p->h |= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPXOR: p->h ^= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPADD: p->h += m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPMINUS: p->h -= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPMULTIPLY: p->h *= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPDIVIDE: p->h /= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPMODULO: p->h %= m->mask; - break; + /*@innerbreak@*/ break; } if (m->mask_op & FILE_OPINVERSE) p->h = ~p->h; @@ -505,28 +505,28 @@ mconvert(struct magic_set *ms, union VALUETYPE *p, struct magic *m) switch (m->mask_op&0x7F) { case FILE_OPAND: p->l &= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPOR: p->l |= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPXOR: p->l ^= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPADD: p->l += m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPMINUS: p->l -= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPMULTIPLY: p->l *= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPDIVIDE: p->l /= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPMODULO: p->l %= m->mask; - break; + /*@innerbreak@*/ break; } if (m->mask_op & FILE_OPINVERSE) p->l = ~p->l; @@ -537,28 +537,28 @@ mconvert(struct magic_set *ms, union VALUETYPE *p, struct magic *m) switch (m->mask_op&0x7F) { case FILE_OPAND: p->h &= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPOR: p->h |= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPXOR: p->h ^= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPADD: p->h += m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPMINUS: p->h -= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPMULTIPLY: p->h *= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPDIVIDE: p->h /= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPMODULO: p->h %= m->mask; - break; + /*@innerbreak@*/ break; } if (m->mask_op & FILE_OPINVERSE) p->h = ~p->h; @@ -572,28 +572,28 @@ mconvert(struct magic_set *ms, union VALUETYPE *p, struct magic *m) switch (m->mask_op&0x7F) { case FILE_OPAND: p->l &= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPOR: p->l |= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPXOR: p->l ^= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPADD: p->l += m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPMINUS: p->l -= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPMULTIPLY: p->l *= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPDIVIDE: p->l /= m->mask; - break; + /*@innerbreak@*/ break; case FILE_OPMODULO: p->l %= m->mask; - break; + /*@innerbreak@*/ break; } if (m->mask_op & FILE_OPINVERSE) p->l = ~p->l; @@ -735,28 +735,28 @@ mget(struct magic_set *ms, union VALUETYPE *p, const unsigned char *s, switch (m->in_op&0x7F) { case FILE_OPAND: offset = p->b & m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPOR: offset = p->b | m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPXOR: offset = p->b ^ m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPADD: offset = p->b + m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPMINUS: offset = p->b - m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPMULTIPLY: offset = p->b * m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPDIVIDE: offset = p->b / m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPMODULO: offset = p->b % m->in_offset; - break; + /*@innerbreak@*/ break; } } else offset = p->b; @@ -770,42 +770,42 @@ mget(struct magic_set *ms, union VALUETYPE *p, const unsigned char *s, offset = (short)((p->hs[0]<<8)| (p->hs[1])) & m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPOR: offset = (short)((p->hs[0]<<8)| (p->hs[1])) | m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPXOR: offset = (short)((p->hs[0]<<8)| (p->hs[1])) ^ m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPADD: offset = (short)((p->hs[0]<<8)| (p->hs[1])) + m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPMINUS: offset = (short)((p->hs[0]<<8)| (p->hs[1])) - m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPMULTIPLY: offset = (short)((p->hs[0]<<8)| (p->hs[1])) * m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPDIVIDE: offset = (short)((p->hs[0]<<8)| (p->hs[1])) / m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPMODULO: offset = (short)((p->hs[0]<<8)| (p->hs[1])) % m->in_offset; - break; + /*@innerbreak@*/ break; } } else offset = (short)((p->hs[0]<<8)| @@ -820,42 +820,42 @@ mget(struct magic_set *ms, union VALUETYPE *p, const unsigned char *s, offset = (short)((p->hs[1]<<8)| (p->hs[0])) & m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPOR: offset = (short)((p->hs[1]<<8)| (p->hs[0])) | m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPXOR: offset = (short)((p->hs[1]<<8)| (p->hs[0])) ^ m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPADD: offset = (short)((p->hs[1]<<8)| (p->hs[0])) + m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPMINUS: offset = (short)((p->hs[1]<<8)| (p->hs[0])) - m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPMULTIPLY: offset = (short)((p->hs[1]<<8)| (p->hs[0])) * m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPDIVIDE: offset = (short)((p->hs[1]<<8)| (p->hs[0])) / m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPMODULO: offset = (short)((p->hs[1]<<8)| (p->hs[0])) % m->in_offset; - break; + /*@innerbreak@*/ break; } } else offset = (short)((p->hs[1]<<8)| @@ -868,28 +868,28 @@ mget(struct magic_set *ms, union VALUETYPE *p, const unsigned char *s, switch (m->in_op & 0x7F) { case FILE_OPAND: offset = p->h & m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPOR: offset = p->h | m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPXOR: offset = p->h ^ m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPADD: offset = p->h + m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPMINUS: offset = p->h - m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPMULTIPLY: offset = p->h * m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPDIVIDE: offset = p->h / m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPMODULO: offset = p->h % m->in_offset; - break; + /*@innerbreak@*/ break; } } else @@ -906,56 +906,56 @@ mget(struct magic_set *ms, union VALUETYPE *p, const unsigned char *s, (p->hl[2]<<8)| (p->hl[3])) & m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPOR: offset = (int32_t)((p->hl[0]<<24)| (p->hl[1]<<16)| (p->hl[2]<<8)| (p->hl[3])) | m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPXOR: offset = (int32_t)((p->hl[0]<<24)| (p->hl[1]<<16)| (p->hl[2]<<8)| (p->hl[3])) ^ m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPADD: offset = (int32_t)((p->hl[0]<<24)| (p->hl[1]<<16)| (p->hl[2]<<8)| (p->hl[3])) + m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPMINUS: offset = (int32_t)((p->hl[0]<<24)| (p->hl[1]<<16)| (p->hl[2]<<8)| (p->hl[3])) - m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPMULTIPLY: offset = (int32_t)((p->hl[0]<<24)| (p->hl[1]<<16)| (p->hl[2]<<8)| (p->hl[3])) * m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPDIVIDE: offset = (int32_t)((p->hl[0]<<24)| (p->hl[1]<<16)| (p->hl[2]<<8)| (p->hl[3])) / m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPMODULO: offset = (int32_t)((p->hl[0]<<24)| (p->hl[1]<<16)| (p->hl[2]<<8)| (p->hl[3])) % m->in_offset; - break; + /*@innerbreak@*/ break; } } else offset = (int32_t)((p->hl[0]<<24)| @@ -974,56 +974,56 @@ mget(struct magic_set *ms, union VALUETYPE *p, const unsigned char *s, (p->hl[1]<<8)| (p->hl[0])) & m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPOR: offset = (int32_t)((p->hl[3]<<24)| (p->hl[2]<<16)| (p->hl[1]<<8)| (p->hl[0])) | m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPXOR: offset = (int32_t)((p->hl[3]<<24)| (p->hl[2]<<16)| (p->hl[1]<<8)| (p->hl[0])) ^ m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPADD: offset = (int32_t)((p->hl[3]<<24)| (p->hl[2]<<16)| (p->hl[1]<<8)| (p->hl[0])) + m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPMINUS: offset = (int32_t)((p->hl[3]<<24)| (p->hl[2]<<16)| (p->hl[1]<<8)| (p->hl[0])) - m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPMULTIPLY: offset = (int32_t)((p->hl[3]<<24)| (p->hl[2]<<16)| (p->hl[1]<<8)| (p->hl[0])) * m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPDIVIDE: offset = (int32_t)((p->hl[3]<<24)| (p->hl[2]<<16)| (p->hl[1]<<8)| (p->hl[0])) / m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPMODULO: offset = (int32_t)((p->hl[3]<<24)| (p->hl[2]<<16)| (p->hl[1]<<8)| (p->hl[0])) % m->in_offset; - break; + /*@innerbreak@*/ break; } } else offset = (int32_t)((p->hl[3]<<24)| @@ -1038,28 +1038,28 @@ mget(struct magic_set *ms, union VALUETYPE *p, const unsigned char *s, switch (m->in_op & 0x7F) { case FILE_OPAND: offset = p->l & m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPOR: offset = p->l | m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPXOR: offset = p->l ^ m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPADD: offset = p->l + m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPMINUS: offset = p->l - m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPMULTIPLY: offset = p->l * m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPDIVIDE: offset = p->l / m->in_offset; - break; + /*@innerbreak@*/ break; case FILE_OPMODULO: offset = p->l % m->in_offset; - break; + /*@innerbreak@*/ break; /* case TOOMANYSWITCHBLOCKS: * ugh = p->eye % m->strain; * rub; @@ -1143,13 +1143,13 @@ mcheck(struct magic_set *ms, union VALUETYPE *p, struct magic *m) if (0L == m->mask) { /* normal string: do it fast */ while (--len >= 0) if ((v = *b++ - *a++) != '\0') - break; + /*@loopbreak@*/ break; } else { /* combine the others */ while (--len >= 0) { if ((m->mask & STRING_IGNORE_LOWERCASE) && islower(*a)) { if ((v = tolower(*b++) - *a++) != '\0') - break; + /*@loopbreak@*/ break; } else if ((m->mask & STRING_COMPACT_BLANK) && isspace(*a)) { a++; @@ -1158,7 +1158,7 @@ mcheck(struct magic_set *ms, union VALUETYPE *p, struct magic *m) b++; } else { v = 1; - break; + /*@loopbreak@*/ break; } } else if (isspace(*a) && (m->mask & STRING_COMPACT_OPTIONAL_BLANK)) { @@ -1167,7 +1167,7 @@ mcheck(struct magic_set *ms, union VALUETYPE *p, struct magic *m) b++; } else { if ((v = *b++ - *a++) != '\0') - break; + /*@loopbreak@*/ break; } } } diff --git a/lib/rpmsx.c b/lib/rpmsx.c index 59087d9..1eebaee 100644 --- a/lib/rpmsx.c +++ b/lib/rpmsx.c @@ -160,13 +160,12 @@ static int rpmsxAdd(rpmsx sx, const char ** bpp) } sxs = sx->sxs + sx->nsxs; sxs->len = stem_len; -#ifdef HAVE_STRNDUP +#ifdef HAVE_STRNDUP /*@i@*/ sxs->stem = strndup(*bpp, stem_len); #else sxs->stem = xmalloc(stem_len+1); strncpy(sxs->stem, *bpp, stem_len); #endif - sx->nsxs++; *bpp += stem_len; return sx->nsxs - 1; diff --git a/misc/Makefile.am b/misc/Makefile.am index 86d7fe7..777ade7 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign -INCLUDES = -I. -I$(top_srcdir) @INCPATH@ +INCLUDES = -I. -I$(top_srcdir) @INCPATH@ EXTRA_DIST = \ alloca.c basename.c err.c error.c \ diff --git a/po/cs.po b/po/cs.po index cc2a028..aac7873 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-17 19:28-0500\n" +"POT-Creation-Date: 2005-01-23 15:29-0500\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" @@ -3089,27 +3089,27 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Nemohu otevøít %s: %s\n" -#: lib/rpmsx.c:375 +#: lib/rpmsx.c:374 #, c-format msgid "%s: no newline on line number %d (only read %s)\n" msgstr "" -#: lib/rpmsx.c:392 +#: lib/rpmsx.c:391 #, c-format msgid "%s: line number %d is missing fields (only read %s)\n" msgstr "" -#: lib/rpmsx.c:425 +#: lib/rpmsx.c:424 #, c-format msgid "%s: unable to compile regular expression %s on line number %d: %s\n" msgstr "" -#: lib/rpmsx.c:440 lib/rpmsx.c:455 +#: lib/rpmsx.c:439 lib/rpmsx.c:454 #, c-format msgid "%s: invalid type specifier %s on line number %d\n" msgstr "" -#: lib/rpmsx.c:468 +#: lib/rpmsx.c:467 #, c-format msgid "%s: invalid context %s on line number %d\n" msgstr "" diff --git a/po/da.po b/po/da.po index cee7808..bba59f6 100644 --- a/po/da.po +++ b/po/da.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-17 19:28-0500\n" +"POT-Creation-Date: 2005-01-23 15:29-0500\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -3104,27 +3104,27 @@ msgstr "Kunne ikke l msgid "Unable to open %s for reading: %s.\n" msgstr "Kunne ikke åbne %s for læsning: %s.\n" -#: lib/rpmsx.c:375 +#: lib/rpmsx.c:374 #, c-format msgid "%s: no newline on line number %d (only read %s)\n" msgstr "" -#: lib/rpmsx.c:392 +#: lib/rpmsx.c:391 #, c-format msgid "%s: line number %d is missing fields (only read %s)\n" msgstr "" -#: lib/rpmsx.c:425 +#: lib/rpmsx.c:424 #, c-format msgid "%s: unable to compile regular expression %s on line number %d: %s\n" msgstr "" -#: lib/rpmsx.c:440 lib/rpmsx.c:455 +#: lib/rpmsx.c:439 lib/rpmsx.c:454 #, c-format msgid "%s: invalid type specifier %s on line number %d\n" msgstr "" -#: lib/rpmsx.c:468 +#: lib/rpmsx.c:467 #, c-format msgid "%s: invalid context %s on line number %d\n" msgstr "" diff --git a/po/de.po b/po/de.po index 548f418..2ef1d9b 100644 --- a/po/de.po +++ b/po/de.po @@ -38,7 +38,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-17 19:28-0500\n" +"POT-Creation-Date: 2005-01-23 15:29-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -3271,27 +3271,27 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s." -#: lib/rpmsx.c:375 +#: lib/rpmsx.c:374 #, c-format msgid "%s: no newline on line number %d (only read %s)\n" msgstr "" -#: lib/rpmsx.c:392 +#: lib/rpmsx.c:391 #, c-format msgid "%s: line number %d is missing fields (only read %s)\n" msgstr "" -#: lib/rpmsx.c:425 +#: lib/rpmsx.c:424 #, c-format msgid "%s: unable to compile regular expression %s on line number %d: %s\n" msgstr "" -#: lib/rpmsx.c:440 lib/rpmsx.c:455 +#: lib/rpmsx.c:439 lib/rpmsx.c:454 #, c-format msgid "%s: invalid type specifier %s on line number %d\n" msgstr "" -#: lib/rpmsx.c:468 +#: lib/rpmsx.c:467 #, c-format msgid "%s: invalid context %s on line number %d\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index 189138c..39fb773 100644 --- a/po/fi.po +++ b/po/fi.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-17 19:28-0500\n" +"POT-Creation-Date: 2005-01-23 15:29-0500\n" "PO-Revision-Date: 1998-05-02 21:41:47-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" @@ -3135,27 +3135,27 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "En voi avata %s luettavaksi: %s." -#: lib/rpmsx.c:375 +#: lib/rpmsx.c:374 #, c-format msgid "%s: no newline on line number %d (only read %s)\n" msgstr "" -#: lib/rpmsx.c:392 +#: lib/rpmsx.c:391 #, c-format msgid "%s: line number %d is missing fields (only read %s)\n" msgstr "" -#: lib/rpmsx.c:425 +#: lib/rpmsx.c:424 #, c-format msgid "%s: unable to compile regular expression %s on line number %d: %s\n" msgstr "" -#: lib/rpmsx.c:440 lib/rpmsx.c:455 +#: lib/rpmsx.c:439 lib/rpmsx.c:454 #, c-format msgid "%s: invalid type specifier %s on line number %d\n" msgstr "" -#: lib/rpmsx.c:468 +#: lib/rpmsx.c:467 #, c-format msgid "%s: invalid context %s on line number %d\n" msgstr "" diff --git a/po/fr.po b/po/fr.po index c5f1c93..b3dfa4b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM 4.2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-17 19:28-0500\n" +"POT-Creation-Date: 2005-01-23 15:29-0500\n" "PO-Revision-Date: 2003-07-06 01:36+0200\n" "Last-Translator: RPM French Translation \n" "Language-Team: RPM French Translation \n" @@ -3117,27 +3117,27 @@ msgstr "Impossible de lire %s, HOME trop gros.\n" msgid "Unable to open %s for reading: %s.\n" msgstr "Impossible d'ouvrir %s en lecture: %s.\n" -#: lib/rpmsx.c:375 +#: lib/rpmsx.c:374 #, c-format msgid "%s: no newline on line number %d (only read %s)\n" msgstr "" -#: lib/rpmsx.c:392 +#: lib/rpmsx.c:391 #, c-format msgid "%s: line number %d is missing fields (only read %s)\n" msgstr "" -#: lib/rpmsx.c:425 +#: lib/rpmsx.c:424 #, c-format msgid "%s: unable to compile regular expression %s on line number %d: %s\n" msgstr "" -#: lib/rpmsx.c:440 lib/rpmsx.c:455 +#: lib/rpmsx.c:439 lib/rpmsx.c:454 #, c-format msgid "%s: invalid type specifier %s on line number %d\n" msgstr "" -#: lib/rpmsx.c:468 +#: lib/rpmsx.c:467 #, c-format msgid "%s: invalid context %s on line number %d\n" msgstr "" diff --git a/po/gl.po b/po/gl.po index 014221b..c27d0a1 100644 --- a/po/gl.po +++ b/po/gl.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-17 19:28-0500\n" +"POT-Creation-Date: 2005-01-23 15:29-0500\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -2986,27 +2986,27 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "" -#: lib/rpmsx.c:375 +#: lib/rpmsx.c:374 #, c-format msgid "%s: no newline on line number %d (only read %s)\n" msgstr "" -#: lib/rpmsx.c:392 +#: lib/rpmsx.c:391 #, c-format msgid "%s: line number %d is missing fields (only read %s)\n" msgstr "" -#: lib/rpmsx.c:425 +#: lib/rpmsx.c:424 #, c-format msgid "%s: unable to compile regular expression %s on line number %d: %s\n" msgstr "" -#: lib/rpmsx.c:440 lib/rpmsx.c:455 +#: lib/rpmsx.c:439 lib/rpmsx.c:454 #, c-format msgid "%s: invalid type specifier %s on line number %d\n" msgstr "" -#: lib/rpmsx.c:468 +#: lib/rpmsx.c:467 #, c-format msgid "%s: invalid context %s on line number %d\n" msgstr "" diff --git a/po/is.po b/po/is.po index 3fed4dd..e6fa8d4 100644 --- a/po/is.po +++ b/po/is.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-17 19:28-0500\n" +"POT-Creation-Date: 2005-01-23 15:29-0500\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" @@ -3019,27 +3019,27 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Get ekki opnað %s til lesturs: %s.\n" -#: lib/rpmsx.c:375 +#: lib/rpmsx.c:374 #, c-format msgid "%s: no newline on line number %d (only read %s)\n" msgstr "" -#: lib/rpmsx.c:392 +#: lib/rpmsx.c:391 #, c-format msgid "%s: line number %d is missing fields (only read %s)\n" msgstr "" -#: lib/rpmsx.c:425 +#: lib/rpmsx.c:424 #, c-format msgid "%s: unable to compile regular expression %s on line number %d: %s\n" msgstr "" -#: lib/rpmsx.c:440 lib/rpmsx.c:455 +#: lib/rpmsx.c:439 lib/rpmsx.c:454 #, c-format msgid "%s: invalid type specifier %s on line number %d\n" msgstr "" -#: lib/rpmsx.c:468 +#: lib/rpmsx.c:467 #, c-format msgid "%s: invalid context %s on line number %d\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index 844fb3b..5189f6d 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-17 19:28-0500\n" +"POT-Creation-Date: 2005-01-23 15:29-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" @@ -3180,27 +3180,27 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Æɤ߹þ¤à¤¿¤á¤Ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s¡£" -#: lib/rpmsx.c:375 +#: lib/rpmsx.c:374 #, c-format msgid "%s: no newline on line number %d (only read %s)\n" msgstr "" -#: lib/rpmsx.c:392 +#: lib/rpmsx.c:391 #, c-format msgid "%s: line number %d is missing fields (only read %s)\n" msgstr "" -#: lib/rpmsx.c:425 +#: lib/rpmsx.c:424 #, c-format msgid "%s: unable to compile regular expression %s on line number %d: %s\n" msgstr "" -#: lib/rpmsx.c:440 lib/rpmsx.c:455 +#: lib/rpmsx.c:439 lib/rpmsx.c:454 #, c-format msgid "%s: invalid type specifier %s on line number %d\n" msgstr "" -#: lib/rpmsx.c:468 +#: lib/rpmsx.c:467 #, c-format msgid "%s: invalid context %s on line number %d\n" msgstr "" diff --git a/po/ko.po b/po/ko.po index 06dda37..4a498a9 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-17 19:28-0500\n" +"POT-Creation-Date: 2005-01-23 15:29-0500\n" "PO-Revision-Date: 2002-03-04 17:17+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" @@ -3084,27 +3084,27 @@ msgstr "%s( msgid "Unable to open %s for reading: %s.\n" msgstr "%s(À»)¸¦ ¿­ ¼ö ¾øÀ½: %s.\n" -#: lib/rpmsx.c:375 +#: lib/rpmsx.c:374 #, c-format msgid "%s: no newline on line number %d (only read %s)\n" msgstr "" -#: lib/rpmsx.c:392 +#: lib/rpmsx.c:391 #, c-format msgid "%s: line number %d is missing fields (only read %s)\n" msgstr "" -#: lib/rpmsx.c:425 +#: lib/rpmsx.c:424 #, c-format msgid "%s: unable to compile regular expression %s on line number %d: %s\n" msgstr "" -#: lib/rpmsx.c:440 lib/rpmsx.c:455 +#: lib/rpmsx.c:439 lib/rpmsx.c:454 #, c-format msgid "%s: invalid type specifier %s on line number %d\n" msgstr "" -#: lib/rpmsx.c:468 +#: lib/rpmsx.c:467 #, c-format msgid "%s: invalid context %s on line number %d\n" msgstr "" diff --git a/po/no.po b/po/no.po index c6607f8..982fc4e 100644 --- a/po/no.po +++ b/po/no.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-17 19:28-0500\n" +"POT-Creation-Date: 2005-01-23 15:29-0500\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -3056,27 +3056,27 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Kunne ikke åpne spec fil %s: %s\n" -#: lib/rpmsx.c:375 +#: lib/rpmsx.c:374 #, c-format msgid "%s: no newline on line number %d (only read %s)\n" msgstr "" -#: lib/rpmsx.c:392 +#: lib/rpmsx.c:391 #, c-format msgid "%s: line number %d is missing fields (only read %s)\n" msgstr "" -#: lib/rpmsx.c:425 +#: lib/rpmsx.c:424 #, c-format msgid "%s: unable to compile regular expression %s on line number %d: %s\n" msgstr "" -#: lib/rpmsx.c:440 lib/rpmsx.c:455 +#: lib/rpmsx.c:439 lib/rpmsx.c:454 #, c-format msgid "%s: invalid type specifier %s on line number %d\n" msgstr "" -#: lib/rpmsx.c:468 +#: lib/rpmsx.c:467 #, c-format msgid "%s: invalid context %s on line number %d\n" msgstr "" diff --git a/po/pl.po b/po/pl.po index 294085d..1e7783c 100644 --- a/po/pl.po +++ b/po/pl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.3-20030515\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-17 19:28-0500\n" +"POT-Creation-Date: 2005-01-23 15:29-0500\n" "PO-Revision-Date: 2003-06-08 22:42+0200\n" "Last-Translator: Arkadiusz Miskiewicz \n" "Language-Team: Polish \n" @@ -3047,27 +3047,27 @@ msgstr "Nie mo msgid "Unable to open %s for reading: %s.\n" msgstr "Nie mo¿na otworzyæ %s do odczytu: %s.\n" -#: lib/rpmsx.c:375 +#: lib/rpmsx.c:374 #, c-format msgid "%s: no newline on line number %d (only read %s)\n" msgstr "" -#: lib/rpmsx.c:392 +#: lib/rpmsx.c:391 #, c-format msgid "%s: line number %d is missing fields (only read %s)\n" msgstr "" -#: lib/rpmsx.c:425 +#: lib/rpmsx.c:424 #, c-format msgid "%s: unable to compile regular expression %s on line number %d: %s\n" msgstr "" -#: lib/rpmsx.c:440 lib/rpmsx.c:455 +#: lib/rpmsx.c:439 lib/rpmsx.c:454 #, c-format msgid "%s: invalid type specifier %s on line number %d\n" msgstr "" -#: lib/rpmsx.c:468 +#: lib/rpmsx.c:467 #, c-format msgid "%s: invalid context %s on line number %d\n" msgstr "%s: nieprawid³owy kontekst %s w lini numer %d\n" diff --git a/po/pt.po b/po/pt.po index 0952301..1088da4 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-17 19:28-0500\n" +"POT-Creation-Date: 2005-01-23 15:29-0500\n" "PO-Revision-Date: 2002-02-14 10:51+0000\n" "Last-Translator: José Nuno Coelho Sanarra Pires \n" "Language-Team: pt \n" "Language-Team: Brazilian Portuguese\n" @@ -3327,27 +3327,27 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "No consegui abrir: %s\n" -#: lib/rpmsx.c:375 +#: lib/rpmsx.c:374 #, c-format msgid "%s: no newline on line number %d (only read %s)\n" msgstr "" -#: lib/rpmsx.c:392 +#: lib/rpmsx.c:391 #, c-format msgid "%s: line number %d is missing fields (only read %s)\n" msgstr "" -#: lib/rpmsx.c:425 +#: lib/rpmsx.c:424 #, c-format msgid "%s: unable to compile regular expression %s on line number %d: %s\n" msgstr "" -#: lib/rpmsx.c:440 lib/rpmsx.c:455 +#: lib/rpmsx.c:439 lib/rpmsx.c:454 #, c-format msgid "%s: invalid type specifier %s on line number %d\n" msgstr "" -#: lib/rpmsx.c:468 +#: lib/rpmsx.c:467 #, c-format msgid "%s: invalid context %s on line number %d\n" msgstr "" diff --git a/po/ro.po b/po/ro.po index b2b28f6..0b91e4e 100644 --- a/po/ro.po +++ b/po/ro.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-17 19:28-0500\n" +"POT-Creation-Date: 2005-01-23 15:29-0500\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton \n" "Language-Team: Romanian \n" @@ -2986,27 +2986,27 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "" -#: lib/rpmsx.c:375 +#: lib/rpmsx.c:374 #, c-format msgid "%s: no newline on line number %d (only read %s)\n" msgstr "" -#: lib/rpmsx.c:392 +#: lib/rpmsx.c:391 #, c-format msgid "%s: line number %d is missing fields (only read %s)\n" msgstr "" -#: lib/rpmsx.c:425 +#: lib/rpmsx.c:424 #, c-format msgid "%s: unable to compile regular expression %s on line number %d: %s\n" msgstr "" -#: lib/rpmsx.c:440 lib/rpmsx.c:455 +#: lib/rpmsx.c:439 lib/rpmsx.c:454 #, c-format msgid "%s: invalid type specifier %s on line number %d\n" msgstr "" -#: lib/rpmsx.c:468 +#: lib/rpmsx.c:467 #, c-format msgid "%s: invalid context %s on line number %d\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 8369cba..14619df 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-17 19:28-0500\n" +"POT-Creation-Date: 2005-01-23 15:29-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2992,27 +2992,27 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "" -#: lib/rpmsx.c:375 +#: lib/rpmsx.c:374 #, c-format msgid "%s: no newline on line number %d (only read %s)\n" msgstr "" -#: lib/rpmsx.c:392 +#: lib/rpmsx.c:391 #, c-format msgid "%s: line number %d is missing fields (only read %s)\n" msgstr "" -#: lib/rpmsx.c:425 +#: lib/rpmsx.c:424 #, c-format msgid "%s: unable to compile regular expression %s on line number %d: %s\n" msgstr "" -#: lib/rpmsx.c:440 lib/rpmsx.c:455 +#: lib/rpmsx.c:439 lib/rpmsx.c:454 #, c-format msgid "%s: invalid type specifier %s on line number %d\n" msgstr "" -#: lib/rpmsx.c:468 +#: lib/rpmsx.c:467 #, c-format msgid "%s: invalid context %s on line number %d\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 4ea2ca8..2774753 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-17 19:28-0500\n" +"POT-Creation-Date: 2005-01-23 15:29-0500\n" "PO-Revision-Date: 2002-08-27 13:36-0400\n" "Last-Translator: Eugene Kanter, \n" "Language-Team: Black Cat Linux Team \n" @@ -3061,27 +3061,27 @@ msgstr " msgid "Unable to open %s for reading: %s.\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ: %s.\n" -#: lib/rpmsx.c:375 +#: lib/rpmsx.c:374 #, c-format msgid "%s: no newline on line number %d (only read %s)\n" msgstr "" -#: lib/rpmsx.c:392 +#: lib/rpmsx.c:391 #, c-format msgid "%s: line number %d is missing fields (only read %s)\n" msgstr "" -#: lib/rpmsx.c:425 +#: lib/rpmsx.c:424 #, c-format msgid "%s: unable to compile regular expression %s on line number %d: %s\n" msgstr "" -#: lib/rpmsx.c:440 lib/rpmsx.c:455 +#: lib/rpmsx.c:439 lib/rpmsx.c:454 #, c-format msgid "%s: invalid type specifier %s on line number %d\n" msgstr "" -#: lib/rpmsx.c:468 +#: lib/rpmsx.c:467 #, c-format msgid "%s: invalid context %s on line number %d\n" msgstr "" diff --git a/po/sk.po b/po/sk.po index e03039d..aeaa740 100644 --- a/po/sk.po +++ b/po/sk.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-17 19:28-0500\n" +"POT-Creation-Date: 2005-01-23 15:29-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -3136,27 +3136,27 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Nie je mo¾né otvori» %s pre èítanie: %s." -#: lib/rpmsx.c:375 +#: lib/rpmsx.c:374 #, c-format msgid "%s: no newline on line number %d (only read %s)\n" msgstr "" -#: lib/rpmsx.c:392 +#: lib/rpmsx.c:391 #, c-format msgid "%s: line number %d is missing fields (only read %s)\n" msgstr "" -#: lib/rpmsx.c:425 +#: lib/rpmsx.c:424 #, c-format msgid "%s: unable to compile regular expression %s on line number %d: %s\n" msgstr "" -#: lib/rpmsx.c:440 lib/rpmsx.c:455 +#: lib/rpmsx.c:439 lib/rpmsx.c:454 #, c-format msgid "%s: invalid type specifier %s on line number %d\n" msgstr "" -#: lib/rpmsx.c:468 +#: lib/rpmsx.c:467 #, c-format msgid "%s: invalid context %s on line number %d\n" msgstr "" diff --git a/po/sl.po b/po/sl.po index 2ba88b6..255b72e 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,13 +1,13 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primo¾ Peterlin , 2000. -# $Id: sl.po,v 1.389.2.8 2005/01/18 00:30:25 jbj Exp $ +# $Id: sl.po,v 1.389.2.9 2005/01/23 20:45:06 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-17 19:28-0500\n" +"POT-Creation-Date: 2005-01-23 15:29-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" @@ -3140,27 +3140,27 @@ msgstr "Ni mo msgid "Unable to open %s for reading: %s.\n" msgstr "%s ni mo¾no odpreti za branje: %s." -#: lib/rpmsx.c:375 +#: lib/rpmsx.c:374 #, c-format msgid "%s: no newline on line number %d (only read %s)\n" msgstr "" -#: lib/rpmsx.c:392 +#: lib/rpmsx.c:391 #, c-format msgid "%s: line number %d is missing fields (only read %s)\n" msgstr "" -#: lib/rpmsx.c:425 +#: lib/rpmsx.c:424 #, c-format msgid "%s: unable to compile regular expression %s on line number %d: %s\n" msgstr "" -#: lib/rpmsx.c:440 lib/rpmsx.c:455 +#: lib/rpmsx.c:439 lib/rpmsx.c:454 #, c-format msgid "%s: invalid type specifier %s on line number %d\n" msgstr "" -#: lib/rpmsx.c:468 +#: lib/rpmsx.c:467 #, c-format msgid "%s: invalid context %s on line number %d\n" msgstr "" diff --git a/po/sr.po b/po/sr.po index 572b513..0a8f571 100644 --- a/po/sr.po +++ b/po/sr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-17 19:28-0500\n" +"POT-Creation-Date: 2005-01-23 15:29-0500\n" "PO-Revision-Date: 2004-02-29 07:48+0500\n" "Last-Translator: unknown\n" "Language-Team: unknown\n" @@ -3129,27 +3129,27 @@ msgstr "" msgid "Unable to open %s for reading: %s.\n" msgstr "Ne mogu da otvorim %s za èitanje: %s" -#: lib/rpmsx.c:375 +#: lib/rpmsx.c:374 #, c-format msgid "%s: no newline on line number %d (only read %s)\n" msgstr "" -#: lib/rpmsx.c:392 +#: lib/rpmsx.c:391 #, c-format msgid "%s: line number %d is missing fields (only read %s)\n" msgstr "" -#: lib/rpmsx.c:425 +#: lib/rpmsx.c:424 #, c-format msgid "%s: unable to compile regular expression %s on line number %d: %s\n" msgstr "" -#: lib/rpmsx.c:440 lib/rpmsx.c:455 +#: lib/rpmsx.c:439 lib/rpmsx.c:454 #, c-format msgid "%s: invalid type specifier %s on line number %d\n" msgstr "" -#: lib/rpmsx.c:468 +#: lib/rpmsx.c:467 #, c-format msgid "%s: invalid context %s on line number %d\n" msgstr "" diff --git a/po/sv.po b/po/sv.po index 68abcea..3a413e8 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-17 19:28-0500\n" +"POT-Creation-Date: 2005-01-23 15:29-0500\n" "PO-Revision-Date: 2003-02-05 12:40+0100\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -3047,27 +3047,27 @@ msgstr "Kan inte l msgid "Unable to open %s for reading: %s.\n" msgstr "Kan inte öppna %s för läsning: %s.\n" -#: lib/rpmsx.c:375 +#: lib/rpmsx.c:374 #, c-format msgid "%s: no newline on line number %d (only read %s)\n" msgstr "" -#: lib/rpmsx.c:392 +#: lib/rpmsx.c:391 #, c-format msgid "%s: line number %d is missing fields (only read %s)\n" msgstr "" -#: lib/rpmsx.c:425 +#: lib/rpmsx.c:424 #, c-format msgid "%s: unable to compile regular expression %s on line number %d: %s\n" msgstr "" -#: lib/rpmsx.c:440 lib/rpmsx.c:455 +#: lib/rpmsx.c:439 lib/rpmsx.c:454 #, c-format msgid "%s: invalid type specifier %s on line number %d\n" msgstr "" -#: lib/rpmsx.c:468 +#: lib/rpmsx.c:467 #, c-format msgid "%s: invalid context %s on line number %d\n" msgstr "" diff --git a/po/tr.po b/po/tr.po index 03a72b7..6154db9 100644 --- a/po/tr.po +++ b/po/tr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-17 19:28-0500\n" +"POT-Creation-Date: 2005-01-23 15:29-0500\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" @@ -3105,27 +3105,27 @@ msgstr "%s okunam msgid "Unable to open %s for reading: %s.\n" msgstr "%s okuma eriþimi için açýlamadý: %s.\n" -#: lib/rpmsx.c:375 +#: lib/rpmsx.c:374 #, c-format msgid "%s: no newline on line number %d (only read %s)\n" msgstr "" -#: lib/rpmsx.c:392 +#: lib/rpmsx.c:391 #, c-format msgid "%s: line number %d is missing fields (only read %s)\n" msgstr "" -#: lib/rpmsx.c:425 +#: lib/rpmsx.c:424 #, c-format msgid "%s: unable to compile regular expression %s on line number %d: %s\n" msgstr "" -#: lib/rpmsx.c:440 lib/rpmsx.c:455 +#: lib/rpmsx.c:439 lib/rpmsx.c:454 #, c-format msgid "%s: invalid type specifier %s on line number %d\n" msgstr "" -#: lib/rpmsx.c:468 +#: lib/rpmsx.c:467 #, c-format msgid "%s: invalid context %s on line number %d\n" msgstr "" diff --git a/python/Makefile.am b/python/Makefile.am index 2f3841a..ffaaf60 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -12,13 +12,13 @@ SUBDIRS = rpmdb rpm EXTRA_DIST = system.h rpmdebug-py.c INCLUDES = -I. \ - -I$(top_srcdir) \ + -I$(top_srcdir)/build \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/rpmdb \ -I$(top_srcdir)/rpmio \ @WITH_BEECRYPT_INCLUDE@ \ -I$(top_srcdir)/popt \ - -I$(top_srcdir)/build \ + -I$(top_srcdir)/misc \ -I$(pyincdir) \ @WITH_LIBELF_INCLUDE@ \ @INCPATH@ diff --git a/python/rpmts-py.c b/python/rpmts-py.c index 56d386a..30a8de5 100644 --- a/python/rpmts-py.c +++ b/python/rpmts-py.c @@ -1073,6 +1073,8 @@ rpmtsCallback(/*@unused@*/ const void * hd, const rpmCallbackType what, if (_rpmts_debug) fprintf(stderr, "\t%p = fdDup(%d)\n", fd, fdno); + fcntl(Fileno(fd), F_SETFD, FD_CLOEXEC); + return fd; } else if (what == RPMCALLBACK_INST_CLOSE_FILE) { diff --git a/rpmdb/legacy.c b/rpmdb/legacy.c index 8dde1549..5da92a3 100644 --- a/rpmdb/legacy.c +++ b/rpmdb/legacy.c @@ -196,8 +196,8 @@ int domd5(const char * fn, unsigned char * digest, int asAscii, size_t *fsizep) #endif case URL_IS_HTTPS: case URL_IS_HTTP: - case URL_IS_HKP: case URL_IS_FTP: + case URL_IS_HKP: case URL_IS_DASH: default: /* Either use the pipe to prelink -y or open the URL. */ diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c index e54cae0..43f6ba1 100644 --- a/rpmdb/rpmdb.c +++ b/rpmdb/rpmdb.c @@ -931,8 +931,8 @@ rpmdb newRpmdb(/*@kept@*/ /*@null@*/ const char * root, break; case URL_IS_HTTPS: case URL_IS_HTTP: - case URL_IS_HKP: case URL_IS_FTP: + case URL_IS_HKP: case URL_IS_DASH: default: db->db_root = rpmGetPath(_DB_ROOT, NULL); @@ -3490,8 +3490,8 @@ static int rpmioFileExists(const char * urlfn) switch (urltype) { case URL_IS_HTTPS: /* XXX WRONG WRONG WRONG */ case URL_IS_HTTP: /* XXX WRONG WRONG WRONG */ - case URL_IS_HKP: /* XXX WRONG WRONG WRONG */ case URL_IS_FTP: /* XXX WRONG WRONG WRONG */ + case URL_IS_HKP: /* XXX WRONG WRONG WRONG */ case URL_IS_PATH: case URL_IS_UNKNOWN: if (Stat(fn, &buf)) { diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c index 6dade9e..f8a1cf6 100644 --- a/rpmio/rpmio.c +++ b/rpmio/rpmio.c @@ -673,7 +673,7 @@ fprintf(stderr, "*** read: fd %p rc %d EOF errno %d %s \"%s\"\n", fd, rc, errno, */ const char *const ftpStrerror(int errorNumber) { - switch (errorNumber) { + switch (errorNumber) { case 0: return _("Success"); @@ -723,7 +723,7 @@ const char *const ftpStrerror(int errorNumber) case FTPERR_UNKNOWN: default: return _("Unknown or unexpected error"); - } + } } const char *urlStrerror(const char *url) diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c index b5e4664..67877dd 100644 --- a/rpmio/rpmpgp.c +++ b/rpmio/rpmpgp.c @@ -378,7 +378,7 @@ int pgpPrtSubType(const byte *h, unsigned int hlen, pgpSigType sigtype) pgpPrtVal(" ", pgpSubTypeTbl, (p[0]&(~PGPSUBTYPE_CRITICAL))); if (p[0] & PGPSUBTYPE_CRITICAL) if (_print) - fprintf(stderr, " *CRITICAL*"); + fprintf(stderr, " *CRITICAL*"); switch (*p) { case PGPSUBTYPE_PREFER_SYMKEY: /* preferred symmetric algorithms */ for (i = 1; i < plen; i++)