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: 26-Jun-2017 00:45:50
Branch: rpm-5_4 Handle: 2017062522455000
Modified files: (Branch: rpm-5_4)
rpm/rpmio rpmjs17.cpp rpmjs24.cpp rpmjs31.cpp rpmjs38.cpp
Log:
- rpmjss: ensure that gOutfile and gErrfile are set.
Summary:
Revision Changes Path
1.1.2.10 +3 -2 rpm/rpmio/rpmjs17.cpp
1.1.2.11 +3 -2 rpm/rpmio/rpmjs24.cpp
1.1.2.11 +3 -2 rpm/rpmio/rpmjs31.cpp
1.1.2.11 +3 -2 rpm/rpmio/rpmjs38.cpp
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmjs17.cpp
============================================================================
$ cvs diff -u -r1.1.2.9 -r1.1.2.10 rpmjs17.cpp
--- rpm/rpmio/rpmjs17.cpp 25 Jun 2017 08:20:01 -0000 1.1.2.9
+++ rpm/rpmio/rpmjs17.cpp 25 Jun 2017 22:45:50 -0000 1.1.2.10
@@ -69,8 +69,6 @@
int gExitCode = 0;
bool gQuitting = false;
bool gGotError = false;
-FILE *gErrFile = NULL;
-FILE *gOutFile = NULL;
static bool reportWarnings = true;
static bool compileOnly = false;
@@ -678,6 +676,7 @@
static JSBool
PutStr(JSContext *cx, unsigned argc, jsval *vp)
{
+ FILE *gOutFile = stdout;
jsval *argv;
JSString *str;
char *bytes;
@@ -743,12 +742,14 @@
static JSBool
Print(JSContext *cx, unsigned argc, jsval *vp)
{
+ FILE *gOutFile = stdout;
return PrintInternal(cx, argc, vp, gOutFile);
}
static JSBool
PrintErr(JSContext *cx, unsigned argc, jsval *vp)
{
+ FILE *gErrFile = stderr;
return PrintInternal(cx, argc, vp, gErrFile);
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmjs24.cpp
============================================================================
$ cvs diff -u -r1.1.2.10 -r1.1.2.11 rpmjs24.cpp
--- rpm/rpmio/rpmjs24.cpp 25 Jun 2017 08:20:01 -0000 1.1.2.10
+++ rpm/rpmio/rpmjs24.cpp 25 Jun 2017 22:45:50 -0000 1.1.2.11
@@ -74,8 +74,6 @@
int gExitCode = 0;
bool gQuitting = false;
bool gGotError = false;
-FILE *gErrFile = NULL;
-FILE *gOutFile = NULL;
static bool reportWarnings = true;
static bool compileOnly = false;
@@ -1087,6 +1085,7 @@
static JSBool
PutStr(JSContext *cx, unsigned argc, jsval *vp)
{
+ FILE *gOutFile = stdout;
CallArgs args = CallArgsFromVp(argc, vp);
if (args.length() != 0) {
@@ -1155,6 +1154,7 @@
static JSBool
Print(JSContext *cx, unsigned argc, jsval *vp)
{
+ FILE *gOutFile = stdout;
CallArgs args = CallArgsFromVp(argc, vp);
return PrintInternal(cx, args, gOutFile);
}
@@ -1162,6 +1162,7 @@
static JSBool
PrintErr(JSContext *cx, unsigned argc, jsval *vp)
{
+ FILE *gErrFile = stderr;
CallArgs args = CallArgsFromVp(argc, vp);
return PrintInternal(cx, args, gErrFile);
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmjs31.cpp
============================================================================
$ cvs diff -u -r1.1.2.10 -r1.1.2.11 rpmjs31.cpp
--- rpm/rpmio/rpmjs31.cpp 25 Jun 2017 08:20:02 -0000 1.1.2.10
+++ rpm/rpmio/rpmjs31.cpp 25 Jun 2017 22:45:50 -0000 1.1.2.11
@@ -63,8 +63,6 @@
static int gExitCode = 0;
static bool gQuitting = false;
static bool gGotError = false;
-static FILE *gErrFile = nullptr;
-static FILE *gOutFile = nullptr;
static bool reportWarnings = true;
static bool compileOnly = false;
@@ -1111,6 +1109,7 @@
static bool
PutStr(JSContext *cx, unsigned argc, jsval *vp)
{
+ FILE *gOutFile = stdout;
CallArgs args = CallArgsFromVp(argc, vp);
if (args.length() != 0) {
@@ -1176,6 +1175,7 @@
static bool
Print(JSContext *cx, unsigned argc, jsval *vp)
{
+ FILE *gOutFile = stdout;
CallArgs args = CallArgsFromVp(argc, vp);
return PrintInternal(cx, args, gOutFile);
}
@@ -1183,6 +1183,7 @@
static bool
PrintErr(JSContext *cx, unsigned argc, jsval *vp)
{
+ FILE *gErrFile = stderr;
CallArgs args = CallArgsFromVp(argc, vp);
return PrintInternal(cx, args, gErrFile);
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmjs38.cpp
============================================================================
$ cvs diff -u -r1.1.2.10 -r1.1.2.11 rpmjs38.cpp
--- rpm/rpmio/rpmjs38.cpp 25 Jun 2017 08:20:02 -0000 1.1.2.10
+++ rpm/rpmio/rpmjs38.cpp 25 Jun 2017 22:45:50 -0000 1.1.2.11
@@ -78,8 +78,6 @@
static int gExitCode = 0;
static bool gQuitting = false;
static bool gGotError = false;
-static FILE* gErrFile = nullptr;
-static FILE* gOutFile = nullptr;
static bool reportWarnings = true;
static bool compileOnly = false;
@@ -1142,6 +1140,7 @@
static bool
PutStr(JSContext* cx, unsigned argc, jsval* vp)
{
+ FILE* gOutFile = stdout;
CallArgs args = CallArgsFromVp(argc, vp);
if (args.length() != 0) {
@@ -1199,6 +1198,7 @@
static bool
Print(JSContext* cx, unsigned argc, jsval* vp)
{
+ FILE* gOutFile = stdout;
CallArgs args = CallArgsFromVp(argc, vp);
return PrintInternal(cx, args, gOutFile);
}
@@ -1206,6 +1206,7 @@
static bool
PrintErr(JSContext* cx, unsigned argc, jsval* vp)
{
+ FILE* gErrFile = stderr;
CallArgs args = CallArgsFromVp(argc, vp);
return PrintInternal(cx, args, gErrFile);
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
