X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=blobdiff_plain;f=usystem.c;h=743c701c8c12744bf9c02280329fab83f52fbaa2;hp=0d0a84723309fee3ec3bf99ccb8f0e6ecd6f1283;hb=HEAD;hpb=4011e8678d85310eedf19fd00aa5d96a9a60770a

diff --git a/usystem.c b/usystem.c
index 0d0a847..743c701 100644
--- a/usystem.c
+++ b/usystem.c
@@ -5,7 +5,8 @@
  * Massachusetts.
  *
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free
+ * Software Foundation, Inc.
  *
  * The following terms apply to Digital Equipment Corporation's copyright
  * interest in XBoard:
@@ -266,22 +267,6 @@ ParseIcsTextColors ()
     SetTextColor(cnames, textColors[ColorNormal].fg - 30, textColors[ColorNormal].bg - 40, -2); // kludge to announce background color to front-end 
 }
 
-static Boolean noEcho;
-
-void
-EchoOn ()
-{
-    system("stty echo");
-    noEcho = False;
-}
-
-void
-EchoOff ()
-{
-    system("stty -echo");
-    noEcho = True;
-}
-
 char *oldICSInteractionTitle;
 
 void
@@ -293,7 +278,7 @@ ShutDownFrontEnd ()
     if (saveSettingsOnExit) SaveSettings(settingsFileName);
     unlink(gameCopyFilename);
     unlink(gamePasteFilename);
-    if(noEcho) EchoOn();
+    EchoOn();
 }
 
 void
@@ -362,7 +347,7 @@ ExpandPathName (char *path)
 
     if (*s == '~') {
 	if(s[1] == '~') { // use ~~ for XBoard's private data directory
-	  snprintf(d, 4*MSG_SIZ, DATADIR "%s", s+2);
+	  snprintf(d, 4*MSG_SIZ, "%s%s", dataDir, s+2);
 	} else
 	if (*(s+1) == '/') {
 	  safeStrCpy(d, getpwuid(getuid())->pw_dir, 4*MSG_SIZ );
@@ -531,6 +516,32 @@ DestroyChildProcess (ProcRef pr, int signalType)
     close(cp->fdTo);
 }
 
+char *
+BufferCommandOutput (char *command, int size)
+{
+    char *res = (char *) calloc(1, size);
+    if(res) {
+	int count;
+	FILE *f;
+#if 0
+	ChildProc *pr;
+	StartChildProcess(command, ".", (ProcRef) &pr);    // run command in daughter process
+	f = fdopen(pr->fdFrom, "r");
+	count = fread(res, 1, size-1, f);  // read its output
+	fclose(f);
+	DestroyChildProcess((ProcRef) pr, 9);
+	free(pr);
+#else
+	f = popen(command, "r");
+	if(!f) return res;
+	count = fread(res, 1, size-1, f);  // read its output
+	pclose(f);
+#endif
+	res[count > 0 ? count : 0] = NULLCHAR;  
+    }
+    return res; // return buffer with output
+}
+
 void
 InterruptChildProcess (ProcRef pr)
 {