From 1d9a4b73a37c6e942f909c2d42ca13b5c47e8362 Mon Sep 17 00:00:00 2001
From: Mystery Man <unknown@mandriva.org>
Date: Tue, 5 Apr 2005 19:41:54 +0000
Subject: This commit was manufactured by cvs2svn to create tag 'V10_2_20mdk'.

---
 mdk-stage1/dietlibc/libstdio/clearerr.c       |  5 ---
 mdk-stage1/dietlibc/libstdio/fclose.c         | 22 ---------
 mdk-stage1/dietlibc/libstdio/fdglue.c         | 22 ---------
 mdk-stage1/dietlibc/libstdio/fdglue2.c        | 43 ------------------
 mdk-stage1/dietlibc/libstdio/fdopen.c         | 13 ------
 mdk-stage1/dietlibc/libstdio/fdprintf.c       | 13 ------
 mdk-stage1/dietlibc/libstdio/feof.c           |  7 ---
 mdk-stage1/dietlibc/libstdio/ferror.c         |  5 ---
 mdk-stage1/dietlibc/libstdio/fflush.c         | 64 ---------------------------
 mdk-stage1/dietlibc/libstdio/fgetc_unlocked.c | 30 -------------
 mdk-stage1/dietlibc/libstdio/fgetpos.c        |  8 ----
 mdk-stage1/dietlibc/libstdio/fgets.c          | 18 --------
 mdk-stage1/dietlibc/libstdio/fileno.c         |  5 ---
 mdk-stage1/dietlibc/libstdio/fopen.c          | 15 -------
 mdk-stage1/dietlibc/libstdio/fprintf.c        | 13 ------
 mdk-stage1/dietlibc/libstdio/fputc_unlocked.c | 20 ---------
 mdk-stage1/dietlibc/libstdio/fputs.c          |  6 ---
 mdk-stage1/dietlibc/libstdio/fread.c          | 46 -------------------
 mdk-stage1/dietlibc/libstdio/freopen.c        |  9 ----
 mdk-stage1/dietlibc/libstdio/fscanf.c         | 14 ------
 mdk-stage1/dietlibc/libstdio/fseek.c          | 10 -----
 mdk-stage1/dietlibc/libstdio/fseeko.c         | 10 -----
 mdk-stage1/dietlibc/libstdio/fseeko64.c       | 12 -----
 mdk-stage1/dietlibc/libstdio/fsetpos.c        |  7 ---
 mdk-stage1/dietlibc/libstdio/ftell.c          |  7 ---
 mdk-stage1/dietlibc/libstdio/ftello.c         |  7 ---
 mdk-stage1/dietlibc/libstdio/ftello64.c       |  9 ----
 mdk-stage1/dietlibc/libstdio/fwrite.c         | 28 ------------
 mdk-stage1/dietlibc/libstdio/printf.c         | 15 -------
 mdk-stage1/dietlibc/libstdio/putchar.c        |  6 ---
 mdk-stage1/dietlibc/libstdio/puts.c           | 16 -------
 mdk-stage1/dietlibc/libstdio/scanf.c          | 14 ------
 mdk-stage1/dietlibc/libstdio/setvbuf.c        | 34 --------------
 mdk-stage1/dietlibc/libstdio/stderr.c         | 22 ---------
 mdk-stage1/dietlibc/libstdio/stdin.c          | 23 ----------
 mdk-stage1/dietlibc/libstdio/stdout.c         | 23 ----------
 mdk-stage1/dietlibc/libstdio/tmpfile.c        | 12 -----
 mdk-stage1/dietlibc/libstdio/ungetc.c         | 10 -----
 mdk-stage1/dietlibc/libstdio/vfdprintf.c      | 15 -------
 mdk-stage1/dietlibc/libstdio/vfprintf.c       | 15 -------
 mdk-stage1/dietlibc/libstdio/vfscanf.c        | 11 -----
 mdk-stage1/dietlibc/libstdio/vprintf.c        | 15 -------
 mdk-stage1/dietlibc/libstdio/vscanf.c         | 10 -----
 43 files changed, 709 deletions(-)
 delete mode 100644 mdk-stage1/dietlibc/libstdio/clearerr.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/fclose.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/fdglue.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/fdglue2.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/fdopen.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/fdprintf.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/feof.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/ferror.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/fflush.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/fgetc_unlocked.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/fgetpos.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/fgets.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/fileno.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/fopen.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/fprintf.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/fputc_unlocked.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/fputs.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/fread.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/freopen.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/fscanf.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/fseek.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/fseeko.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/fseeko64.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/fsetpos.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/ftell.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/ftello.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/ftello64.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/fwrite.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/printf.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/putchar.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/puts.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/scanf.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/setvbuf.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/stderr.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/stdin.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/stdout.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/tmpfile.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/ungetc.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/vfdprintf.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/vfprintf.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/vfscanf.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/vprintf.c
 delete mode 100644 mdk-stage1/dietlibc/libstdio/vscanf.c

(limited to 'mdk-stage1/dietlibc/libstdio')

diff --git a/mdk-stage1/dietlibc/libstdio/clearerr.c b/mdk-stage1/dietlibc/libstdio/clearerr.c
deleted file mode 100644
index 8bde8c702..000000000
--- a/mdk-stage1/dietlibc/libstdio/clearerr.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "dietstdio.h"
-
-void clearerr( FILE *stream) {
-  stream->flags&=~(ERRORINDICATOR|EOFINDICATOR);
-}
diff --git a/mdk-stage1/dietlibc/libstdio/fclose.c b/mdk-stage1/dietlibc/libstdio/fclose.c
deleted file mode 100644
index 491ed2522..000000000
--- a/mdk-stage1/dietlibc/libstdio/fclose.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "dietstdio.h"
-#include <stdlib.h>
-#include <unistd.h>
-
-int fclose(FILE *stream) {
-  int res;
-  FILE *f,*fl;
-  fflush(stream);
-  res=close(stream->fd);
-  for (fl=0,f=__stdio_root; f; fl=f,f=f->next)
-    if (f==stream) {
-      if (fl)
-	fl->next=f->next;
-      else
-	__stdio_root=f->next;
-      break;
-    }
-  if ((!(stream->flags&STATICBUF))&&(stream->buf))
-    free(stream->buf);
-  free(stream);
-  return res;
-}
diff --git a/mdk-stage1/dietlibc/libstdio/fdglue.c b/mdk-stage1/dietlibc/libstdio/fdglue.c
deleted file mode 100644
index 9542711e2..000000000
--- a/mdk-stage1/dietlibc/libstdio/fdglue.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <pthread.h>
-#include "dietstdio.h"
-
-int __stdio_parse_mode(const char *mode) {
-  int f=0;
-  for (;;) {
-    switch (*mode) {
-    case 0: return f;
-    case 'b': break;
-    case 'r': f=O_RDONLY; break;
-    case 'w': f=O_WRONLY|O_CREAT|O_TRUNC; break;
-    case 'a': f=O_WRONLY|O_CREAT|O_APPEND; break;
-    case '+': f=(f&(~O_WRONLY))|O_RDWR; break;
-    }
-    ++mode;
-  }
-}
-
diff --git a/mdk-stage1/dietlibc/libstdio/fdglue2.c b/mdk-stage1/dietlibc/libstdio/fdglue2.c
deleted file mode 100644
index b96e4c5b8..000000000
--- a/mdk-stage1/dietlibc/libstdio/fdglue2.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include "dietstdio.h"
-#include <stdlib.h>
-#include <pthread.h>
-
-extern int __stdio_atexit;
-
-FILE* __stdio_init_file_nothreads(int fd,int closeonerror);
-FILE* __stdio_init_file_nothreads(int fd,int closeonerror) {
-  FILE *tmp=(FILE*)malloc(sizeof(FILE));
-  if (!tmp) goto err_out;
-  tmp->buf=(char*)malloc(BUFSIZE);
-  if (!tmp->buf) {
-    free(tmp);
-err_out:
-    if (closeonerror) close(fd);
-    errno=ENOMEM;
-    return 0;
-  }
-  tmp->fd=fd;
-  tmp->bm=0;
-  tmp->bs=0;
-  tmp->buflen=BUFSIZE;
-  {
-    struct stat st;
-    fstat(fd,&st);
-    tmp->flags=(S_ISFIFO(st.st_mode))?FDPIPE:0;
-  }
-  tmp->popen_kludge=0;
-  if (__stdio_atexit==0) {
-    __stdio_atexit=1;
-    atexit(__stdio_flushall);
-  }
-  tmp->next=__stdio_root;
-  __stdio_root=tmp;
-  tmp->ungotten=0;
-  return tmp;
-}
-
-FILE* __stdio_init_file(int fd,int closeonerror) __attribute__((weak,alias("__stdio_init_file_nothreads")));
diff --git a/mdk-stage1/dietlibc/libstdio/fdopen.c b/mdk-stage1/dietlibc/libstdio/fdopen.c
deleted file mode 100644
index 748b716eb..000000000
--- a/mdk-stage1/dietlibc/libstdio/fdopen.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <errno.h>
-#include "dietfeatures.h"
-#include <sys/types.h>
-#include <dietstdio.h>
-#include <unistd.h>
-
-FILE *fdopen(int filedes, const char *mode) {
-  int f=0;	/* O_RDONLY, O_WRONLY or O_RDWR */
-
-  f=__stdio_parse_mode(mode);
-  if (filedes<0) { errno=EBADF; return 0; }
-  return __stdio_init_file(filedes,0);
-}
diff --git a/mdk-stage1/dietlibc/libstdio/fdprintf.c b/mdk-stage1/dietlibc/libstdio/fdprintf.c
deleted file mode 100644
index f9fc7a3b4..000000000
--- a/mdk-stage1/dietlibc/libstdio/fdprintf.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdarg.h>
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int fdprintf(int fd,const char *format,...) {
-  int n;
-  va_list arg_ptr;
-  va_start(arg_ptr,format);
-  n=vfdprintf(fd,format,arg_ptr);
-  va_end(arg_ptr);
-  return n;
-}
diff --git a/mdk-stage1/dietlibc/libstdio/feof.c b/mdk-stage1/dietlibc/libstdio/feof.c
deleted file mode 100644
index bf2267fcf..000000000
--- a/mdk-stage1/dietlibc/libstdio/feof.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <dietstdio.h>
-
-int feof(FILE *stream) {
-  /* yuck!!! */
-  if (stream->ungotten) return 0;
-  return (stream->flags&EOFINDICATOR);
-}
diff --git a/mdk-stage1/dietlibc/libstdio/ferror.c b/mdk-stage1/dietlibc/libstdio/ferror.c
deleted file mode 100644
index e86873be0..000000000
--- a/mdk-stage1/dietlibc/libstdio/ferror.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <dietstdio.h>
-
-int ferror(FILE *stream) {
-  return (stream->flags&ERRORINDICATOR);
-}
diff --git a/mdk-stage1/dietlibc/libstdio/fflush.c b/mdk-stage1/dietlibc/libstdio/fflush.c
deleted file mode 100644
index e0e23b3ba..000000000
--- a/mdk-stage1/dietlibc/libstdio/fflush.c
+++ /dev/null
@@ -1,64 +0,0 @@
-#include <unistd.h>
-#include <stdlib.h>
-#include "dietwarning.h"
-#include "dietstdio.h"
-
-FILE *__stdio_root;
-
-int __stdio_atexit=0;
-
-void __stdio_flushall(void) {
-  fflush(0);
-}
-
-int fflush(FILE *stream) {
-  if (stream==0) {
-    int res;
-    FILE *f;
-    __fflush_stdin();
-    __fflush_stdout();
-    __fflush_stderr();
-    for (res=0, f=__stdio_root; f; f=f->next)
-      if (fflush(f))
-	res=-1;
-    return res;
-  }
-//  if (stream->flags&NOBUF) return 0;
-  if (stream->flags&BUFINPUT) {
-    register int tmp;
-    if ((tmp=stream->bm-stream->bs)) {
-      lseek(stream->fd,tmp,SEEK_CUR);
-    }
-    stream->bs=stream->bm=0;
-  } else {
-    if (stream->bm && write(stream->fd,stream->buf,stream->bm)!=(int)stream->bm) {
-      stream->flags|=ERRORINDICATOR;
-      return -1;
-    }
-    stream->bm=0;
-  }
-  return 0;
-}
-
-int __fflush4(FILE *stream,int next) {
-  if (!__stdio_atexit) {
-    __stdio_atexit=1;
-    atexit(__stdio_flushall);
-  }
-  if ((stream->flags&BUFINPUT)!=next) {
-    int res=fflush(stream);
-    stream->flags=(stream->flags&~BUFINPUT)|next;
-    return res;
-  }
-  if (stream->fd==0) __fflush_stdout();
-  return 0;
-}
-
-/* Internal function, has no prototype.
- * This is defined here because of the weak symbol ELF semantics */
-int __stdio_outs(const char *s,size_t len);
-int __stdio_outs(const char *s,size_t len) {
-  return fwrite(s,1,(size_t)len,stdout)==len?1:0;
-}
-
-link_warning("fflush","warning: your code uses stdio (7+k bloat).")
diff --git a/mdk-stage1/dietlibc/libstdio/fgetc_unlocked.c b/mdk-stage1/dietlibc/libstdio/fgetc_unlocked.c
deleted file mode 100644
index 5136c8df1..000000000
--- a/mdk-stage1/dietlibc/libstdio/fgetc_unlocked.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "dietstdio.h"
-#include <unistd.h>
-
-int fgetc_unlocked(FILE *stream) {
-  unsigned char c;
-  if (stream->ungotten) {
-    stream->ungotten=0;
-    return stream->ungetbuf;
-  }
-  if (feof(stream))
-    return EOF;
-  if (__fflush4(stream,BUFINPUT)) return EOF;
-  if (stream->bm>=stream->bs) {
-    int len=read(stream->fd,stream->buf,stream->buflen);
-    if (len==0) {
-      stream->flags|=EOFINDICATOR;
-      return EOF;
-    } else if (len<0) {
-      stream->flags|=ERRORINDICATOR;
-      return EOF;
-    }
-    stream->bm=0;
-    stream->bs=len;
-  }
-  c=stream->buf[stream->bm];
-  ++stream->bm;
-  return c;
-}
-
-int fgetc(FILE* stream) __attribute__((weak,alias("fgetc_unlocked")));
diff --git a/mdk-stage1/dietlibc/libstdio/fgetpos.c b/mdk-stage1/dietlibc/libstdio/fgetpos.c
deleted file mode 100644
index d58b6fa5b..000000000
--- a/mdk-stage1/dietlibc/libstdio/fgetpos.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <stdio.h>
-
-int fgetpos(FILE *stream, fpos_t *pos) {
-  long l=ftell(stream);
-  if (l==-1) return -1;
-  *pos=l;
-  return 0;
-}
diff --git a/mdk-stage1/dietlibc/libstdio/fgets.c b/mdk-stage1/dietlibc/libstdio/fgets.c
deleted file mode 100644
index d2ce4195d..000000000
--- a/mdk-stage1/dietlibc/libstdio/fgets.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "dietstdio.h"
-
-char *fgets(char *s, int size, FILE *stream) {
-  char *orig=s;
-  int l;
-  for (l=size; l>1;) {
-    int c=fgetc(stream);
-    if (c==EOF) break;
-    *s=c;
-    ++s;
-    --l;
-    if (c=='\n') break;
-  }
-  if (l==size || ferror(stream))
-    return 0;
-  *s=0;
-  return orig;
-}
diff --git a/mdk-stage1/dietlibc/libstdio/fileno.c b/mdk-stage1/dietlibc/libstdio/fileno.c
deleted file mode 100644
index f021d3881..000000000
--- a/mdk-stage1/dietlibc/libstdio/fileno.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <dietstdio.h>
-
-int fileno(FILE *stream) {
-  return stream->fd;
-}
diff --git a/mdk-stage1/dietlibc/libstdio/fopen.c b/mdk-stage1/dietlibc/libstdio/fopen.c
deleted file mode 100644
index 3d9c28198..000000000
--- a/mdk-stage1/dietlibc/libstdio/fopen.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <sys/types.h>
-#include <dietstdio.h>
-#include <unistd.h>
-
-extern int __stdio_atexit;
-
-FILE *fopen (const char *path, const char *mode) {
-  int f=0;	/* O_RDONLY, O_WRONLY or O_RDWR */
-  int fd;
-
-  f=__stdio_parse_mode(mode);
-  if ((fd=open(path,f,0666))<0)
-    return 0;
-  return __stdio_init_file(fd,1);
-}
diff --git a/mdk-stage1/dietlibc/libstdio/fprintf.c b/mdk-stage1/dietlibc/libstdio/fprintf.c
deleted file mode 100644
index 6b3849a33..000000000
--- a/mdk-stage1/dietlibc/libstdio/fprintf.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdarg.h>
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int fprintf(FILE *f,const char *format,...) {
-  int n;
-  va_list arg_ptr;
-  va_start(arg_ptr,format);
-  n=vfprintf(f,format,arg_ptr);
-  va_end(arg_ptr);
-  return n;
-}
diff --git a/mdk-stage1/dietlibc/libstdio/fputc_unlocked.c b/mdk-stage1/dietlibc/libstdio/fputc_unlocked.c
deleted file mode 100644
index 6441c5741..000000000
--- a/mdk-stage1/dietlibc/libstdio/fputc_unlocked.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <dietstdio.h>
-#include <unistd.h>
-
-int fputc_unlocked(int c, FILE *stream) {
-  if (__fflush4(stream,0)) return EOF;
-  if (stream->bm>=stream->buflen-1)
-    if (fflush(stream)) return EOF;
-  if (stream->flags&NOBUF) {
-    if (write(stream->fd,&c,1) != 1) return EOF;
-    return 0;
-  }
-  stream->buf[stream->bm]=c;
-  ++stream->bm;
-  if (((stream->flags&BUFLINEWISE) && c=='\n') ||
-      ((stream->flags&NOBUF))) /* puke */
-    if (fflush(stream)) return EOF;
-  return 0;
-}
-
-int fputc(int c,FILE* stream) __attribute__((weak,alias("fputc_unlocked")));
diff --git a/mdk-stage1/dietlibc/libstdio/fputs.c b/mdk-stage1/dietlibc/libstdio/fputs.c
deleted file mode 100644
index 51ee9a96e..000000000
--- a/mdk-stage1/dietlibc/libstdio/fputs.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "dietstdio.h"
-#include <string.h>
-
-int fputs(const char *s, FILE *stream) {
-  return fwrite(s,strlen(s),1,stream);
-}
diff --git a/mdk-stage1/dietlibc/libstdio/fread.c b/mdk-stage1/dietlibc/libstdio/fread.c
deleted file mode 100644
index 813a98fb2..000000000
--- a/mdk-stage1/dietlibc/libstdio/fread.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <sys/types.h>
-#include "dietstdio.h"
-#include <unistd.h>
-
-size_t fread( void *ptr, size_t size, size_t nmemb, FILE *stream) {
-  int res;
-  unsigned long i,j;
-  j=size*nmemb;
-  i=0;
-
-  if (!j || j/nmemb!=size) return 0;
-  if (stream->ungotten) {
-    stream->ungotten=0;
-    *(char*)ptr=stream->ungetbuf;
-    ++i;
-  }
-  if (!j) return 1;
-
-#ifdef WANT_FREAD_OPTIMIZATION
-  if ( !(stream->flags&FDPIPE) && (j>stream->buflen)) {
-    size_t tmp=j-i;
-    int res;
-    fflush(stream);
-    while ((res=read(stream->fd,ptr+i,tmp))<(int)tmp) {
-      if (res==-1) {
-	stream->flags|=ERRORINDICATOR;
-	goto exit;
-      } else if (!res) {
-	stream->flags|=EOFINDICATOR;
-	goto exit;
-      }
-      i+=res; tmp-=res;
-    }
-    return nmemb;
-  }
-#endif
-  for (; i<j; ++i) {
-    res=fgetc(stream);
-    if (res==EOF)
-exit:
-      return i/size;
-    else
-      ((unsigned char*)ptr)[i]=(unsigned char)res;
-  }
-  return nmemb;
-}
diff --git a/mdk-stage1/dietlibc/libstdio/freopen.c b/mdk-stage1/dietlibc/libstdio/freopen.c
deleted file mode 100644
index 8d4644a10..000000000
--- a/mdk-stage1/dietlibc/libstdio/freopen.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <sys/types.h>
-#include <dietstdio.h>
-#include <unistd.h>
-
-FILE *freopen (const char *path, const char *mode, FILE *stream) {
-  fclose(stream);
-  stream=fopen(path,mode);
-  return stream;
-}
diff --git a/mdk-stage1/dietlibc/libstdio/fscanf.c b/mdk-stage1/dietlibc/libstdio/fscanf.c
deleted file mode 100644
index 07f477462..000000000
--- a/mdk-stage1/dietlibc/libstdio/fscanf.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include "dietstdio.h"
-#include <unistd.h>
-
-int fscanf(FILE *stream, const char *format, ...) {
-  int n;
-  va_list arg_ptr;
-  va_start(arg_ptr, format);
-  n=vfscanf(stream,format,arg_ptr);
-  va_end (arg_ptr);
-  return n;
-}
diff --git a/mdk-stage1/dietlibc/libstdio/fseek.c b/mdk-stage1/dietlibc/libstdio/fseek.c
deleted file mode 100644
index a49230f0a..000000000
--- a/mdk-stage1/dietlibc/libstdio/fseek.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <dietstdio.h>
-#include <unistd.h>
-
-int fseek(FILE *stream, long offset, int whence) {
-  fflush(stream);
-  stream->bm=0; stream->bs=0;
-  stream->flags&=~(ERRORINDICATOR|EOFINDICATOR);
-  stream->ungotten=0;
-  return lseek(stream->fd,offset,whence)!=-1?0:-1;
-}
diff --git a/mdk-stage1/dietlibc/libstdio/fseeko.c b/mdk-stage1/dietlibc/libstdio/fseeko.c
deleted file mode 100644
index 6459a6ff4..000000000
--- a/mdk-stage1/dietlibc/libstdio/fseeko.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <dietstdio.h>
-#include <unistd.h>
-
-int fseeko(FILE *stream, off_t offset, int whence) {
-  fflush(stream);
-  stream->bm=0; stream->bs=0;
-  stream->flags&=~(ERRORINDICATOR|EOFINDICATOR);
-  stream->ungotten=0;
-  return lseek(stream->fd,offset,whence)!=-1?0:-1;
-}
diff --git a/mdk-stage1/dietlibc/libstdio/fseeko64.c b/mdk-stage1/dietlibc/libstdio/fseeko64.c
deleted file mode 100644
index 3b00596a1..000000000
--- a/mdk-stage1/dietlibc/libstdio/fseeko64.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <dietstdio.h>
-#include <unistd.h>
-
-#ifndef __NO_STAT64
-int fseeko64(FILE *stream, off64_t offset, int whence) {
-  fflush(stream);
-  stream->bm=0; stream->bs=0;
-  stream->flags&=~(ERRORINDICATOR|EOFINDICATOR);
-  stream->ungotten=0;
-  return lseek64(stream->fd,offset,whence)!=-1?0:-1;
-}
-#endif
diff --git a/mdk-stage1/dietlibc/libstdio/fsetpos.c b/mdk-stage1/dietlibc/libstdio/fsetpos.c
deleted file mode 100644
index 336135fff..000000000
--- a/mdk-stage1/dietlibc/libstdio/fsetpos.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdio.h>
-
-int fsetpos(FILE *stream, fpos_t *pos) {
-  if (fseek(stream,*pos,SEEK_SET)==-1)
-    return -1;
-  return 0;
-}
diff --git a/mdk-stage1/dietlibc/libstdio/ftell.c b/mdk-stage1/dietlibc/libstdio/ftell.c
deleted file mode 100644
index 48f74858a..000000000
--- a/mdk-stage1/dietlibc/libstdio/ftell.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <dietstdio.h>
-#include <unistd.h>
-
-long ftell(FILE *stream) {
-  fflush(stream);
-  return (lseek(stream->fd,0,SEEK_CUR)-stream->ungotten);
-}
diff --git a/mdk-stage1/dietlibc/libstdio/ftello.c b/mdk-stage1/dietlibc/libstdio/ftello.c
deleted file mode 100644
index 9d36318e2..000000000
--- a/mdk-stage1/dietlibc/libstdio/ftello.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <dietstdio.h>
-#include <unistd.h>
-
-off_t ftello(FILE *stream) {
-  fflush(stream);
-  return (lseek(stream->fd,0,SEEK_CUR));
-}
diff --git a/mdk-stage1/dietlibc/libstdio/ftello64.c b/mdk-stage1/dietlibc/libstdio/ftello64.c
deleted file mode 100644
index bda7a7de4..000000000
--- a/mdk-stage1/dietlibc/libstdio/ftello64.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <dietstdio.h>
-#include <unistd.h>
-
-#ifndef __NO_STAT64
-off64_t ftello64(FILE *stream) {
-  fflush(stream);
-  return (lseek64(stream->fd,0ull,SEEK_CUR));
-}
-#endif
diff --git a/mdk-stage1/dietlibc/libstdio/fwrite.c b/mdk-stage1/dietlibc/libstdio/fwrite.c
deleted file mode 100644
index e2536ccfb..000000000
--- a/mdk-stage1/dietlibc/libstdio/fwrite.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <sys/types.h>
-#include "dietstdio.h"
-#include <unistd.h>
-#include <errno.h>
-
-size_t fwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream) {
-  int res;
-  unsigned long len=size*nmemb;
-  long i;
-  if (!nmemb || len/nmemb!=size) return 0; /* check for integer overflow */
-  if (len>stream->buflen || (stream->flags&NOBUF)) {
-    fflush(stream);
-    do {
-      res=write(stream->fd,ptr,size*nmemb);
-    } while (res==-1 && errno==EINTR);
-  } else {
-    register const unsigned char *c=ptr;
-    for (i=len; i>0; --i,++c)
-      if (fputc(*c,stream)) { res=len-i; goto abort; }
-    res=len;
-  }
-  if (res<0) {
-    stream->flags|=ERRORINDICATOR;
-    return 0;
-  }
-abort:
-  return size?res/size:0;
-}
diff --git a/mdk-stage1/dietlibc/libstdio/printf.c b/mdk-stage1/dietlibc/libstdio/printf.c
deleted file mode 100644
index 5af172c58..000000000
--- a/mdk-stage1/dietlibc/libstdio/printf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdarg.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include "dietstdio.h"
-
-int printf(const char *format,...)
-{
-  int n;
-  va_list arg_ptr;
-  va_start(arg_ptr, format);
-  n=vprintf(format, arg_ptr);
-  va_end(arg_ptr);
-  return n;
-}
diff --git a/mdk-stage1/dietlibc/libstdio/putchar.c b/mdk-stage1/dietlibc/libstdio/putchar.c
deleted file mode 100644
index 7e5285a48..000000000
--- a/mdk-stage1/dietlibc/libstdio/putchar.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <stdio.h>
-
-#undef putchar
-int putchar(int c) {
-  return fputc(c,stdout);
-}
diff --git a/mdk-stage1/dietlibc/libstdio/puts.c b/mdk-stage1/dietlibc/libstdio/puts.c
deleted file mode 100644
index b1da01f9d..000000000
--- a/mdk-stage1/dietlibc/libstdio/puts.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <unistd.h>
-#include <string.h>
-#include "dietstdio.h"
-#include "dietfeatures.h"
-
-int __cheap_outs(const char *s,size_t len);
-int __cheap_outs(const char *s,size_t len) {
-  return (size_t)write(1,s,len)==len?1:0;
-}
-
-int __stdio_outs(const char *s,size_t len)  __attribute__((weak,alias("__cheap_outs")));
-
-int puts(const char *s) {
-  return (__stdio_outs(s,strlen(s)) && __stdio_outs("\n",1))?0:-1;
-}
-
diff --git a/mdk-stage1/dietlibc/libstdio/scanf.c b/mdk-stage1/dietlibc/libstdio/scanf.c
deleted file mode 100644
index 589c19f41..000000000
--- a/mdk-stage1/dietlibc/libstdio/scanf.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <stdarg.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include "dietstdio.h"
-#include <unistd.h>
-
-int scanf(const char *format, ...) {
-  int n;
-  va_list arg_ptr;
-  va_start(arg_ptr, format);
-  n=vfscanf(stdin,format,arg_ptr);
-  va_end (arg_ptr);
-  return n;
-}
diff --git a/mdk-stage1/dietlibc/libstdio/setvbuf.c b/mdk-stage1/dietlibc/libstdio/setvbuf.c
deleted file mode 100644
index b8b50addf..000000000
--- a/mdk-stage1/dietlibc/libstdio/setvbuf.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <sys/types.h>
-#include "dietstdio.h"
-#include <unistd.h>
-#include <stdlib.h>
-#include "dietwarning.h"
-
-static int set_flags (FILE *stream, int flags) {
-  switch (flags) {
-    case _IONBF: stream->flags = (stream->flags & ~(BUFLINEWISE)) | NOBUF; break;
-    case _IOLBF: stream->flags = (stream->flags & ~(NOBUF)) | BUFLINEWISE; break;
-    case _IOFBF: stream->flags = stream->flags & ~(NOBUF | BUFLINEWISE); break;
-    default: return -1;
-  }
-  return 0;
-}
-
-int setvbuf(FILE *stream, char *buf, int flags, size_t size) {
-  if (buf) {
-    if (!(stream->flags&STATICBUF)) free(stream->buf);
-    stream->buf=buf;
-  }
-  else {
-    char *tmp;
-    if (!size) {
-      return set_flags(stream,flags);
-    }
-    if (!(tmp=malloc(size))) return -1;
-    if (!(stream->flags&STATICBUF)) free(stream->buf);
-    stream->buf=tmp;
-  }
-  stream->buflen=size;
-  stream->bm=stream->bs=0;
-  return set_flags(stream,flags);
-}
diff --git a/mdk-stage1/dietlibc/libstdio/stderr.c b/mdk-stage1/dietlibc/libstdio/stderr.c
deleted file mode 100644
index a9a34fd7e..000000000
--- a/mdk-stage1/dietlibc/libstdio/stderr.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <dietstdio.h>
-
-static FILE __stderr = {
-  .fd=2,
-  .flags=NOBUF,
-  .bs=0, .bm=0,
-  .buflen=0,
-  .buf=0,
-  .next=0,
-  .popen_kludge=0,
-  .ungetbuf=0,
-  .ungotten=0
-#ifdef WANT_THREAD_SAFE
-  , .m=PTHREAD_MUTEX_INITIALIZER
-#endif
-};
-
-FILE *stderr=&__stderr;
-
-int __fflush_stderr(void) {
-  return fflush(stderr);
-}
diff --git a/mdk-stage1/dietlibc/libstdio/stdin.c b/mdk-stage1/dietlibc/libstdio/stdin.c
deleted file mode 100644
index 217f3f609..000000000
--- a/mdk-stage1/dietlibc/libstdio/stdin.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <dietstdio.h>
-
-static char __stdin_buf[BUFSIZE];
-static FILE __stdin = {
-  .fd=0,
-  .flags=BUFINPUT|STATICBUF,
-  .bs=0, .bm=0,
-  .buflen=BUFSIZE,
-  .buf=__stdin_buf,
-  .next=0,
-  .popen_kludge=0,
-  .ungetbuf=0,
-  .ungotten=0
-#ifdef WANT_THREAD_SAFE
-  , .m=PTHREAD_MUTEX_INITIALIZER
-#endif
-};
-
-FILE *stdin=&__stdin;
-
-int __fflush_stdin(void) {
-  return fflush(stdin);
-}
diff --git a/mdk-stage1/dietlibc/libstdio/stdout.c b/mdk-stage1/dietlibc/libstdio/stdout.c
deleted file mode 100644
index 08054d0d4..000000000
--- a/mdk-stage1/dietlibc/libstdio/stdout.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <dietstdio.h>
-
-static char __stdout_buf[BUFSIZE];
-static FILE __stdout = {
-  .fd=1,
-  .flags=BUFLINEWISE|STATICBUF,
-  .bs=0, .bm=0,
-  .buflen=BUFSIZE,
-  .buf=__stdout_buf,
-  .next=0,
-  .popen_kludge=0,
-  .ungetbuf=0,
-  .ungotten=0
-#ifdef WANT_THREAD_SAFE
-  , .m=PTHREAD_MUTEX_INITIALIZER
-#endif
-};
-
-FILE *stdout=&__stdout;
-
-int __fflush_stdout(void) {
-  return fflush(stdout);
-}
diff --git a/mdk-stage1/dietlibc/libstdio/tmpfile.c b/mdk-stage1/dietlibc/libstdio/tmpfile.c
deleted file mode 100644
index b20d8410d..000000000
--- a/mdk-stage1/dietlibc/libstdio/tmpfile.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "dietstdio.h"
-#include <stdlib.h>
-#include <unistd.h>
-
-FILE *tmpfile (void) {
-  int fd;
-  char template[20] = "/tmp/tmpfile-XXXXXX";
-  if ((fd=mkstemp(template))<0)
-    return 0;
-  unlink(template);
-  return __stdio_init_file(fd,1);
-}
diff --git a/mdk-stage1/dietlibc/libstdio/ungetc.c b/mdk-stage1/dietlibc/libstdio/ungetc.c
deleted file mode 100644
index 133e92820..000000000
--- a/mdk-stage1/dietlibc/libstdio/ungetc.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "dietstdio.h"
-
-int ungetc(int c, FILE *stream) {
-  if (stream->ungotten || c<0 || c>255)
-    return EOF;
-  stream->ungotten=1;
-  stream->ungetbuf=(unsigned char)c;
-  stream->flags&=~(ERRORINDICATOR|EOFINDICATOR);
-  return c;
-}
diff --git a/mdk-stage1/dietlibc/libstdio/vfdprintf.c b/mdk-stage1/dietlibc/libstdio/vfdprintf.c
deleted file mode 100644
index fdfeb09e1..000000000
--- a/mdk-stage1/dietlibc/libstdio/vfdprintf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdarg.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include "dietstdio.h"
-
-static int __fwrite(void*ptr, size_t nmemb, int fd) {
-  return write(fd,ptr,nmemb);
-}
-
-int vfdprintf(int fd, const char *format, va_list arg_ptr)
-{
-  struct arg_printf ap = { (void*)(long)fd, (int(*)(void*,size_t,void*)) __fwrite };
-  return __v_printf(&ap,format,arg_ptr);
-}
diff --git a/mdk-stage1/dietlibc/libstdio/vfprintf.c b/mdk-stage1/dietlibc/libstdio/vfprintf.c
deleted file mode 100644
index 5e64cf099..000000000
--- a/mdk-stage1/dietlibc/libstdio/vfprintf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdarg.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include "dietstdio.h"
-
-static int __fwrite(void*ptr, size_t nmemb, FILE* f) {
-  return fwrite(ptr,1,nmemb,f);
-}
-
-int vfprintf(FILE *stream, const char *format, va_list arg_ptr)
-{
-  struct arg_printf ap = { stream, (int(*)(void*,size_t,void*)) __fwrite };
-  return __v_printf(&ap,format,arg_ptr);
-}
diff --git a/mdk-stage1/dietlibc/libstdio/vfscanf.c b/mdk-stage1/dietlibc/libstdio/vfscanf.c
deleted file mode 100644
index 6d75a45ac..000000000
--- a/mdk-stage1/dietlibc/libstdio/vfscanf.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <stdarg.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include "dietstdio.h"
-#include <unistd.h>
-
-int vfscanf(FILE *stream, const char *format, va_list arg_ptr)
-{
-  struct arg_scanf farg = { (void*)stream, (int(*)(void*))fgetc, (int(*)(int,void*))ungetc };
-  return __v_scanf(&farg,format,arg_ptr);
-}
diff --git a/mdk-stage1/dietlibc/libstdio/vprintf.c b/mdk-stage1/dietlibc/libstdio/vprintf.c
deleted file mode 100644
index 7fe579e0a..000000000
--- a/mdk-stage1/dietlibc/libstdio/vprintf.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdarg.h>
-#include <unistd.h>
-#include "dietstdio.h"
-
-int __stdio_outs(const char *s,size_t len) __attribute__((weak));
-int __stdio_outs(const char *s,size_t len) {
-  return (write(1,s,len)==(int)len)?1:0;
-}
-
-int vprintf(const char *format, va_list ap)
-{
-  struct arg_printf _ap = { 0, (int(*)(void*,size_t,void*)) __stdio_outs };
-  return __v_printf(&_ap,format,ap);
-}
-
diff --git a/mdk-stage1/dietlibc/libstdio/vscanf.c b/mdk-stage1/dietlibc/libstdio/vscanf.c
deleted file mode 100644
index ba9358fc4..000000000
--- a/mdk-stage1/dietlibc/libstdio/vscanf.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdarg.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include "dietstdio.h"
-#include <unistd.h>
-
-int vscanf(const char *format, va_list arg_ptr)
-{
-  return vfscanf(stdin,format,arg_ptr);
-}
-- 
cgit v1.2.1