[CVS] RPM: rpm/js/ gsr.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 17-Jan-2010 11:38:55
Branch: HEAD Handle: 2010011710385500
Modified files:
rpm/js gsr.c
Log:
- gsrL sabity.
Summary:
RevisionChanges Path
1.6 +17 -8 rpm/js/gsr.c
patch -p0 <<'@@ .'
Index: rpm/js/gsr.c
$ cvs diff -u -r1.5 -r1.6 gsr.c
--- rpm/js/gsr.c 15 Jan 2010 05:10:57 - 1.5
+++ rpm/js/gsr.c 17 Jan 2010 10:38:55 - 1.6
@@ -37,7 +37,7 @@
* @file gsr.c GPSEE Script Runner ("scripting host")
* @author Wes Garland
* @date Aug 27 2007
- * @version $Id: gsr.c,v 1.5 2010/01/15 05:10:57 jbj Exp $
+ * @version $Id: gsr.c,v 1.6 2010/01/17 10:38:55 jbj Exp $
*
* This program is designed to interpret a JavaScript program as much like
* a shell script as possible.
@@ -55,7 +55,7 @@
*/
static __attribute__ ((unused))
-const char rcsid[] = "$Id: gsr.c,v 1.5 2010/01/15 05:10:57 jbj Exp $";
+const char rcsid[] = "$Id: gsr.c,v 1.6 2010/01/17 10:38:55 jbj Exp $";
#include "system.h"
@@ -252,22 +252,31 @@
N_("Allow (read-only) access to caller's environmen"), NULL },
{ "nocache", 'C', POPT_BIT_SET,&_js.flags, RPMJS_FLAGS_NOCACHE,
N_("Disables compiler caching via JSScript XDR serialization"), NULL
},
- { NULL, 'd', POPT_ARG_NONE,NULL, 'd',
-N_("Increase verbosity"), NULL },
+ { "loadrc", 'R', POPT_BIT_SET, &_js.flags, RPMJS_FLAGS_LOADRC,
+N_("Load RC file for interpreter (" PRODUCT_SHORTNAME ") based on
script filename."), NULL },
+ { "nowarn", 'W', POPT_BIT_SET, &_js.flags, RPMJS_FLAGS_NOWARN,
+N_("Do not report warnings"), NULL },
+
{ "norelimit", 'e', POPT_BIT_CLR, &_js.flags, RPMJS_FLAGS_RELIMIT,
N_("Do not limit regexps to n^3 levels of backtracking"), NULL },
{ "nojit", 'J', POPT_BIT_CLR, &_js.flags, RPMJS_FLAGS_JIT,
N_("Disable nanojit"), NULL },
{ "nostrict", 'S', POPT_BIT_CLR, &_js.flags, RPMJS_FLAGS_STRICT,
N_("Disable Strict mode"), NULL },
- { "loadrc", 'R', POPT_BIT_SET, &_js.flags, RPMJS_FLAGS_LOADRC,
-N_("Load RC file for interpreter (" PRODUCT_SHORTNAME ") based on
script filename."), NULL },
{ "noutf8", 'U', POPT_BIT_SET, &_js.flags, RPMJS_FLAGS_NOUTF8,
N_("Disable UTF-8 C string processing"), NULL },
- { "nowarn", 'W', POPT_BIT_SET, &_js.flags, RPMJS_FLAGS_NOWARN,
-N_("Do not report warnings"), NULL },
{ "xml", 'x', POPT_BIT_SET,&_js.flags, RPMJS_FLAGS_XML,
N_("Parse as E4X tokens"), NULL },
+
+ { "anonfunfix", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
&_js.flags, RPMJS_FLAGS_ANONFUNFIX,
+N_("Parse //@line number [\"filename\"] for XUL"), NULL },
+ { "atline", 'A', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &_js.flags,
RPMJS_FLAGS_ATLINE,
+N_("Parse //@line number [\"filename\"] for XUL"), NULL },
+ { "werror", 'w', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &_js.flags,
RPMJS_FLAGS_WERROR,
+N_("Convert warnings to errors"), NULL },
+
+ { NULL, 'd', POPT_ARG_NONE,NULL, 'd',
+N_("Increase verbosity"), NULL },
{ "gczeal", 'z', POPT_ARG_NONE,NULL, 'z',
N_("Increase GC Zealousness"), NULL },
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: syck/lib/ syck.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: syck Date: 17-Jan-2010 11:51:35
Branch: HEAD Handle: 2010011710513400
Modified files:
syck/libsyck.c
Log:
syck: remove compiler warning.
Summary:
RevisionChanges Path
1.5 +1 -1 syck/lib/syck.c
patch -p0 <<'@@ .'
Index: syck/lib/syck.c
$ cvs diff -u -r1.4 -r1.5 syck.c
--- syck/lib/syck.c 31 Mar 2009 23:05:59 - 1.4
+++ syck/lib/syck.c 17 Jan 2010 10:51:34 - 1.5
@@ -521,7 +521,7 @@
void
syck_default_error_handler( SyckParser *p, char *msg )
{
-printf( "Error at [Line %d, Col %d]: %s\n",
+printf( "Error at [Line %d, Col %ld]: %s\n",
p->linect,
p->cursor - p->lineptr,
msg );
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ configure.ac debug.h rpm/js/ rpmmpw-js.c rpmst-js.c rp...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 17-Jan-2010 13:16:32
Branch: HEAD Handle: 2010011712163002
Modified files:
rpm configure.ac debug.h
rpm/js rpmmpw-js.c rpmst-js.c rpmsys-js.c rpmte-js.c
syck-js.c
rpm/rpmio arirang.c bzdio.c groestl.c lsyck.c rpmjs.c
rpmzq.c
rpm/tools augtool.c
Log:
- remove compiler warnings.
Summary:
RevisionChanges Path
2.429 +3 -0 rpm/configure.ac
2.7 +3 -0 rpm/debug.h
1.21+11 -11 rpm/js/rpmmpw-js.c
1.10+1 -1 rpm/js/rpmst-js.c
1.8 +1 -1 rpm/js/rpmsys-js.c
1.19+1 -1 rpm/js/rpmte-js.c
1.9 +2 -2 rpm/js/syck-js.c
2.7 +2 -2 rpm/rpmio/arirang.c
2.24+2 -2 rpm/rpmio/bzdio.c
2.2 +2 -2 rpm/rpmio/groestl.c
2.7 +9 -9 rpm/rpmio/lsyck.c
1.28+3 -2 rpm/rpmio/rpmjs.c
1.27+6 -2 rpm/rpmio/rpmzq.c
2.14+94 -0 rpm/tools/augtool.c
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.428 -r2.429 configure.ac
--- rpm/configure.ac 10 Jan 2010 15:35:26 - 2.428
+++ rpm/configure.ac 17 Jan 2010 12:16:30 - 2.429
@@ -662,6 +662,9 @@
])
fi
+dnl # tries to retrofit an assert(x) macro
+AC_CHECK_HEADERS(assert.h)
+
dnl # FIXME: platform-hack: MiNT
AC_CHECK_LIB(port, writev)
@@ .
patch -p0 <<'@@ .'
Index: rpm/debug.h
$ cvs diff -u -r2.6 -r2.7 debug.h
--- rpm/debug.h 6 Jan 2010 07:27:49 - 2.6
+++ rpm/debug.h 17 Jan 2010 12:16:30 - 2.7
@@ -4,7 +4,10 @@
#ifndef H_DEBUG
#define H_DEBUG
+#ifdef HAVE_ASSERT_H
+#undef assert /* tries to retrofit an assert(x)
macro */
#include
+#endif
#ifdef __LCLINT__
#define ntohl(_x) (_x)
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmmpw-js.c
$ cvs diff -u -r1.20 -r1.21 rpmmpw-js.c
--- rpm/js/rpmmpw-js.c10 Jan 2010 18:29:12 - 1.20
+++ rpm/js/rpmmpw-js.c17 Jan 2010 12:16:31 - 1.21
@@ -365,7 +365,7 @@
/*...@global stderr, fileSystem @*/
/*...@modifies stderr, fileSystem @*/
{
-fprintf(stderr, "%5.5s %p[%d]:\t", msg, MPW_DATA(x), MPW_SIZE(x)),
mpfprintln(stderr, MPW_SIZE(x), MPW_DATA(x));
+fprintf(stderr, "%5.5s %p[%u]:\t", msg, MPW_DATA(x), (unsigned)MPW_SIZE(x)),
mpfprintln(stderr, MPW_SIZE(x), MPW_DATA(x));
}
static size_t
@@ -387,7 +387,7 @@
res = (nbits * mp_bases[base].chars_per_bit_exactly) + 1;
}
if (_debug < -1)
-fprintf(stderr, "<== mpsizeinbase(%p[%d], %d) res %u\n", xdata, xsize, base,
(unsigned)res);
+fprintf(stderr, "<== mpsizeinbase(%p[%u], %u) res %u\n", xdata,
(unsigned)xsize, (unsigned)base, (unsigned)res);
return res;
}
@@ -439,7 +439,7 @@
size_t result;
if (_debug < -1)
-fprintf(stderr, "*** mpstr(%p[%d], %p[%d], %d):\t", t, nt, data, size,
base), mpfprintln(stderr, size, data);
+fprintf(stderr, "*** mpstr(%p[%u], %p[%u], %u):\t", t, (unsigned)nt, data,
(unsigned)size, (unsigned)base), mpfprintln(stderr, size, data);
mpsetx(asize, adata, size, data);
@@ -449,8 +449,8 @@
mpndivmod(zdata, asize, adata, 1, &base, wksp);
if (_debug < -1) {
-fprintf(stderr, "a %p[%d]:\t", adata, asize), mpfprintln(stderr, asize,
adata);
-fprintf(stderr, "z %p[%d]:\t", zdata, asize+1), mpfprintln(stderr,
asize+1, zdata);
+fprintf(stderr, "a %p[%u]:\t", adata, (unsigned)asize),
mpfprintln(stderr, asize, adata);
+fprintf(stderr, "z %p[%u]:\t", zdata, (unsigned)asize+1),
mpfprintln(stderr, asize+1, zdata);
}
result = zdata[asize];
t[nt] = bchars[result];
@@ -495,7 +495,7 @@
#endif
if (_debug < -1)
-fprintf(stderr, "==> %s(%p,%d,%d):\t", __FUNCTION__, z, base, addL),
mpfprintln(stderr, zsize, zdata);
+fprintf(stderr, "==> %s(%p,%u,%d):\t", __FUNCTION__, z, (unsigned)base,
addL), mpfprintln(stderr, zsize, zdata);
assert(base >= 2 && base <= 36);
@@ -840,7 +840,7 @@
size = MP_ROUND_B2W(15 * xbits);
if (_debug < 0)
-fprintf(stderr, "*** pbits %
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 18-Jan-2010 05:26:15 Branch: HEAD Handle: 2010011804261500 Modified files: rpm devtool.conf Log: - eastham: build against gpsee on leopard. Summary: RevisionChanges Path 2.331 +4 -3 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.330 -r2.331 devtool.conf --- rpm/devtool.conf 10 Jan 2010 05:13:25 - 2.330 +++ rpm/devtool.conf 18 Jan 2010 04:26:15 - 2.331 @@ -238,12 +238,12 @@ --without-augeas \ --with-beecrypt=external \ --with-openssl=external \ ---with-nss=none \ +--with-nss=external \ --with-gcrypt=external \ --with-neon=external \ --with-pcre=internal \ --without-uuid \ ---without-xar \ +--with-xar=/opt/local/lib:/opt/local/include/xar \ --with-popt=external \ --without-keyutils \ --with-pthreads \ @@ -253,7 +253,8 @@ --without-ficl \ --without-bash \ --without-rc \ ---with-js=internal \ +--with-js=/opt/local/gpsee/jsapi \ +--with-gpsee=/opt/local/gpsee \ --with-python \ --with-pythonembed=/opt/local/lib:/opt/local/include/python2.5 \ --with-perl \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 18-Jan-2010 05:29:32 Branch: HEAD Handle: 2010011804293200 Modified files: rpm devtool.conf Log: - falmouth: build against gpsee on snow leopard. Summary: RevisionChanges Path 2.332 +5 -4 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.331 -r2.332 devtool.conf --- rpm/devtool.conf 18 Jan 2010 04:26:15 - 2.331 +++ rpm/devtool.conf 18 Jan 2010 04:29:32 - 2.332 @@ -203,12 +203,13 @@ --without-selinux \ --without-squirrel \ --without-ficl \ ---with-bash=internal \ +--without-bash \ --with-installed-readline \ --with-rc=internal \ ---with-js=internal \ ---with-python \ ---with-pythonembed=/opt/local/lib:/opt/local/include/python2.5 \ +--with-js=/opt/local/gpsee/jsapi \ +--with-gpsee=/opt/local/gpsee \ +--with-python=system \ +--with-pythonembed=/usr/lib:/usr/include/python2.6 \ --with-perl \ --without-perlembed \ --with-ruby=/opt/local/lib/ruby/1.8 \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
