* Makefile (subdirs): Replace stdio with stdio-common and $(stdio).

	* configure.in: Grok arg --enable-libio.
	($stdio = libio): Define USE_IN_LIBIO.
	* config.h.in (USE_IN_LIBIO): Add #undef.
	* config.make.in (stdio): New variable, set by configure.
	* Makeconfig (stdio): New variable.
	* stdio.h [USE_IN_LIBIO]: Include libio/stdio.h instead of
	stdio/stdio.h.
	* stdio-common/Makefile: New file.
	* stdio/Makefile: Half the contents moved to stdio-common/Makefile.
	* stdio/_itoa.c: Moved to stdio-common.
	* stdio/_itoa.h: Moved to stdio-common.
	* stdio/asprintf.c: Moved to stdio-common.
	* stdio/bug1.c: Moved to stdio-common.
	* stdio/bug1.input: Moved to stdio-common.
	* stdio/bug2.c: Moved to stdio-common.
	* stdio/bug3.c: Moved to stdio-common.
	* stdio/bug4.c: Moved to stdio-common.
	* stdio/bug5.c: Moved to stdio-common.
	* stdio/bug6.c: Moved to stdio-common.
	* stdio/bug6.input: Moved to stdio-common.
	* stdio/bug7.c: Moved to stdio-common.
	* stdio/dprintf.c: Moved to stdio-common.
	* stdio/errnobug.c: Moved to stdio-common.
	* stdio/getline.c: Moved to stdio-common.
	* stdio/getw.c: Moved to stdio-common.
	* stdio/perror.c: Moved to stdio-common.
	* stdio/printf-parse.h: Moved to stdio-common.
	* stdio/printf-prs.c: Moved to stdio-common.
	* stdio/printf.c: Moved to stdio-common.
	* stdio/printf.h: Moved to stdio-common.
	* stdio/printf_fp.c: Moved to stdio-common.
	* stdio/psignal.c: Moved to stdio-common.
	* stdio/putw.c: Moved to stdio-common.
	* stdio/reg-printf.c: Moved to stdio-common.
	* stdio/scanf.c: Moved to stdio-common.
	* stdio/snprintf.c: Moved to stdio-common.
	* stdio/sprintf.c: Moved to stdio-common.
	* stdio/sscanf.c: Moved to stdio-common.
	* stdio/tempnam.c: Moved to stdio-common.
	* stdio/temptest.c: Moved to stdio-common.
	* stdio/test-fseek.c: Moved to stdio-common.
	* stdio/test-fwrite.c: Moved to stdio-common.
	* stdio/test-popen.c: Moved to stdio-common.
	* stdio/test_rdwr.c: Moved to stdio-common.
	* stdio/tmpfile.c: Moved to stdio-common.
	* stdio/tmpnam.c: Moved to stdio-common.
	* stdio/tst-fileno.c: Moved to stdio-common.
	* stdio/tst-printf.c: Moved to stdio-common.
	* stdio/tstgetln.c: Moved to stdio-common.
	* stdio/tstgetln.input: Moved to stdio-common.
	* stdio/tstscanf.c: Moved to stdio-common.
	* stdio/tstscanf.input: Moved to stdio-common.
	* stdio/vfprintf.c: Moved to stdio-common.
	* stdio/vfscanf.c: Moved to stdio-common.
	* stdio/vprintf.c: Moved to stdio-common.
	* stdio/xbug.c: Moved to stdio-common.
	* sysdeps/generic/Makefile (siglist.c rules): Do this in subdir
	stdio-common instead of stdio.
	* sysdeps/unix/Makefile (errlist.c rules): Likewise.
	* stdio-common/asprintf.c [USE_IN_LIBIO]: Call libio primitive
	function.
	* stdio-common/dprintf.c: Likewise.
	* stdio-common/printf.c: Likewise.
	* stdio-common/scanf.c: Likewise.
	* stdio-common/snprintf.c: Likewise.
	* stdio-common/sprintf.c: Likewise.
	* stdio-common/sscanf.c: Likewise.
	* stdio-common/vprintf.c: Likewise.

	* Makerules: Include $(+depfiles) directly instead of generating
	depend-$(subdir).
	(depend-$(subdir)): Target removed.
	(common-clean): Don't remove depend-$(subdir).

1 files changed, 0 insertions, 130 deletions

diff --git a/stdio/test_rdwr.c b/stdio/test_rdwr.c
deleted file mode 100644
index f987f16cd4..0000000000
--- a/stdio/test_rdwr.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
-
-#include <ansidecl.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-int
-DEFUN(main, (argc, argv), int argc AND char **argv)
-{
-  static CONST char hello[] = "Hello, world.\n";
-  static CONST char replace[] = "Hewwo, world.\n";
-  static CONST size_t replace_from = 2, replace_to = 4;
-  char filename[FILENAME_MAX];
-  char *name = strrchr(*argv, '/');
-  char buf[BUFSIZ];
-  FILE *f;
-  int lose = 0;
-
-  if (name != NULL)
-    ++name;
-  else
-    name = *argv;
-
-  (void) sprintf(filename, "/tmp/%s.test", name);
-
-  f = fopen(filename, "w+");
-  if (f == NULL)
-    {
-      perror(filename);
-      exit(1);
-    }
-
-  (void) fputs(hello, f);
-  rewind(f);
-  (void) fgets(buf, sizeof(buf), f);
-  rewind(f);
-  (void) fputs(buf, f);
-  rewind(f);
-  {
-    register size_t i;
-    for (i = 0; i < replace_from; ++i)
-      {
-	int c = getc(f);
-	if (c == EOF)
-	  {
-	    printf("EOF at %u.\n", i);
-	    lose = 1;
-	    break;
-	  }
-	else if (c != hello[i])
-	  {
-	    printf("Got '%c' instead of '%c' at %u.\n",
-		   (unsigned char) c, hello[i], i);
-	    lose = 1;
-	    break;
-	  }
-      }
-  }
-
-  {
-    long int where = ftell(f);
-    if (where == replace_from)
-      {
-	register size_t i;
-	for (i = replace_from; i < replace_to; ++i)
-	  if (putc(replace[i], f) == EOF)
-	    {
-	      printf("putc('%c') got %s at %u.\n",
-		     replace[i], strerror(errno), i);
-	      lose = 1;
-	      break;
-	    }
-      }
-    else if (where == -1L)
-      {
-	printf("ftell got %s (should be at %u).\n",
-	       strerror(errno), replace_from);
-	lose = 1;
-      }
-    else
-      {
-	printf("ftell returns %u; should be %u.\n", where, replace_from);
-	lose = 1;
-      }
-  }
-
-  if (!lose)
-    {
-      rewind(f);
-      if (fgets(buf, sizeof(buf), f) == NULL)
-	{
-	  printf("fgets got %s.\n", strerror(errno));
-	  lose = 1;
-	}
-      else if (strcmp(buf, replace))
-	{
-	  printf("Read \"%s\" instead of \"%s\".\n", buf, replace);
-	  lose = 1;
-	}
-    }
-
-  if (lose)
-    printf("Test FAILED!  Losing file is \"%s\".\n", filename);
-  else
-    {
-      (void) remove(filename);
-      puts("Test succeeded.");
-    }
-
-  exit(lose ? EXIT_FAILURE : EXIT_SUCCESS);
-}