From 0ca04ecb02220e9b1d1b372085fedad28fa853f5 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Thu, 9 Oct 2003 08:55:58 +0000
Subject: [PATCH] prompt() method doesn't display prompt if not specified.
---
src/sbbs3/jsexec.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/sbbs3/jsexec.c b/src/sbbs3/jsexec.c
index c372fc49ca..8b61c1a1a5 100644
--- a/src/sbbs3/jsexec.c
+++ b/src/sbbs3/jsexec.c
@@ -316,8 +316,11 @@ js_prompt(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
JSString * prompt;
JSString * str;
- if((prompt=JS_ValueToString(cx, argv[0]))==NULL)
- return(JS_FALSE);
+ if(!JSVAL_IS_VOID(argv[0])) {
+ if((prompt=JS_ValueToString(cx, argv[0]))==NULL)
+ return(JS_FALSE);
+ fprintf(confp,"%s: ",JS_GetStringBytes(prompt));
+ }
if(argc>1) {
if((str=JS_ValueToString(cx, argv[1]))==NULL)
@@ -326,8 +329,6 @@ js_prompt(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
} else
instr[0]=0;
- fprintf(confp,"%s: ",JS_GetStringBytes(prompt));
-
if(!fgets(instr,sizeof(instr),stdin)) {
*rval = JSVAL_VOID;
return(JS_TRUE);
--
GitLab