From 2c41b4d9e1a151dd5568d77163ca390fb7a98c43 Mon Sep 17 00:00:00 2001
From: Serge Vakulenko <serge.vakulenko@gmail.com>
Date: Mon, 7 Sep 2015 21:31:33 -0700
Subject: [PATCH] Fix crash in fsck, when reconnecting lost file.

---
 src/cmd/fsck/dir.c  |  3 ++-
 src/cmd/fsck/fsck.h |  2 --
 src/cmd/fsck/main.c | 19 ++++++++-----------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/cmd/fsck/dir.c b/src/cmd/fsck/dir.c
index fa51107..39b2bea 100644
--- a/src/cmd/fsck/dir.c
+++ b/src/cmd/fsck/dir.c
@@ -508,7 +508,8 @@ linkup(orphan, pdir)
     }
     declncnt(orphan);
     *pathp++ = '/';
-    bcopy(idesc.id_name, pathp, len + 1);
+    len = strlen(tempname);
+    bcopy(tempname, pathp, len + 1);
     pathp += len;
     if (lostdir) {
         dp = ginode(orphan);
diff --git a/src/cmd/fsck/fsck.h b/src/cmd/fsck/fsck.h
index 4c5f40d..734955e 100644
--- a/src/cmd/fsck/fsck.h
+++ b/src/cmd/fsck/fsck.h
@@ -138,8 +138,6 @@ daddr_t *muldup;                /* multiple dups part of table */
 ino_t   zlnlist[MAXLNCNT];      /* zero link count table */
 ino_t   *zlnp;
 
-#define MAXDATA     (84 * 1024)
-#define MEMUNIT     64
 #define NINOBLK     4           /* number of blocks of inodes to read at once */
 
 char    inobuf[NINOBLK*INOPB*sizeof (struct dinode)];   /* allocate now */
diff --git a/src/cmd/fsck/main.c b/src/cmd/fsck/main.c
index d77d0ca..32e1837 100644
--- a/src/cmd/fsck/main.c
+++ b/src/cmd/fsck/main.c
@@ -24,6 +24,8 @@
 
 extern  int returntosingle;
 
+static char memdata[16 * sizeof(BUFAREA)];
+
 char *
 unrawname(cp)
     char *cp;
@@ -221,12 +223,12 @@ main(argc, argv)
 {
     struct fstab *fsp;
     int pid, passno, anygtr, sumstatus;
-    char *name, inbuf[128], outbuf[128];
+    char *name, inbuf[64], outbuf[64], errbuf[64];
     extern void _start();
 
-    setbuffer(stdin, inbuf, sizeof (inbuf));
-    setbuffer(stdout, outbuf, sizeof (outbuf));
-    setlinebuf(stdout);
+    setvbuf(stdin, inbuf, _IOFBF, sizeof (inbuf));
+    setvbuf(stdout, outbuf, _IOLBF, sizeof (outbuf));
+    setvbuf(stderr, errbuf, _IOLBF, sizeof (errbuf));
     sync();
 
     while (--argc > 0 && **++argv == '-') {
@@ -273,13 +275,8 @@ main(argc, argv)
         errexit("Can't open checklist file: %s\n", _PATH_FSTAB);
     setpassent(1);
 
-    memsize = (char*) sbrk(0) - (char*) &_start;
-    memsize = MAXDATA - memsize - sizeof(int);
-    while (memsize >= 2 * sizeof(BUFAREA) &&
-        (membase = (char *)sbrk(memsize)) == (char *)-1)
-        memsize -= MEMUNIT;
-    if (memsize < 2 * sizeof(BUFAREA))
-        errexit("Can't get memory\n");
+    membase = memdata;
+    memsize = sizeof(memdata);
 
     if (signal(SIGINT, SIG_IGN) != SIG_IGN)
         (void)signal(SIGINT, catch);