* spawn.cc (child_info_spawn::worker): Reinstate using temp buffer for wide

character command-line storage.  Use wcs method to convert command line.
* winf.h (lb_wcs): Delete.
(linebuf::wcs): Implement new single-argument method.

1 files changed, 1 insertions, 9 deletions

diff --git a/winsup/cygwin/winf.h b/winsup/cygwin/winf.h
index d7488c360..ca7d2bdd9 100644
--- a/winsup/cygwin/winf.h
+++ b/winsup/cygwin/winf.h
@@ -86,6 +86,7 @@ class linebuf
     wchar_t *wbuf = (wchar_t *) malloc (sizeof (wchar_t) * n);
     return wcs (wbuf, n);
   }
+  wchar_t *wcs (wchar_t *wbuf) { return wcs (wbuf, ix + 1); }
   wchar_t *wcs (wchar_t *wbuf, size_t n)
   {
     if (n == 1)
@@ -95,12 +96,3 @@ class linebuf
     return wbuf;
   }
 };
-
-/* Return a temporary buffer representing the wide character version
-   of a linebuf command line. */
-#define lb_wcs(__x) \
-({ \
- wchar_t __wbuf[(size_t) __x]; \
- __x.wcs (__wbuf, sizeof (__wbuf) / sizeof (__wbuf[0])); \
- __wbuf; \
-})