must rm before ln

[unix-history] / usr / src / usr.bin / sort / sort.c

diff --git a/usr/src/usr.bin/sort/sort.c b/usr/src/usr.bin/sort/sort.c
index 68f59f7..bcc0d7b 100644 (file)
--- a/usr/src/usr.bin/sort/sort.c
+++ b/usr/src/usr.bin/sort/sort.c
@@ -1,14 +1,18 @@
-static char *sccsid = "@(#)sort.c      4.2 (Berkeley) %G%";
+static char *sccsid = "@(#)sort.c      4.5 (Berkeley) %G%";

 #include <stdio.h>
 #include <ctype.h>
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <stdio.h>
 #include <ctype.h>
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 

-#define        L       512
+#define        L       1024

 #define        N       7
 #define        C       20
 #define        N       7
 #define        C       20

+#ifdef vax
+#define        MEM     (64*2048)
+#else

 #define        MEM     (16*2048)
 #define        MEM     (16*2048)

+#endif

 #define NF     10
 
 FILE   *is, *os;
 #define NF     10
 
 FILE   *is, *os;


@@ -65,7 +69,7 @@ char  fold[256] = {
        0100,0101,0102,0103,0104,0105,0106,0107,
        0110,0111,0112,0113,0114,0115,0116,0117,
        0120,0121,0122,0123,0124,0125,0126,0127,
        0100,0101,0102,0103,0104,0105,0106,0107,
        0110,0111,0112,0113,0114,0115,0116,0117,
        0120,0121,0122,0123,0124,0125,0126,0127,

-       0130,0131,0132,0133,0134,0134,0136,0137,
+       0130,0131,0132,0133,0134,0135,0136,0137,

        0140,0101,0102,0103,0104,0105,0106,0107,
        0110,0111,0112,0113,0114,0115,0116,0117,
        0120,0121,0122,0123,0124,0125,0126,0127,
        0140,0101,0102,0103,0104,0105,0106,0107,
        0110,0111,0112,0113,0114,0115,0116,0117,
        0120,0121,0122,0123,0124,0125,0126,0127,


@@ -168,6 +172,8 @@ char        *setfil();
 char   *sbrk();
 char   *brk();
 
 char   *sbrk();
 char   *brk();
 

+#define        blank(c)        ((c) == ' ' || (c) == '\t')
+

 main(argc, argv)
 char **argv;
 {
 main(argc, argv)
 char **argv;
 {


@@ -240,11 +246,13 @@ char **argv;
        lspace = (int *)sbrk(0);
        while((int)brk(ep) == -1)
                ep -= 512;
        lspace = (int *)sbrk(0);
        while((int)brk(ep) == -1)
                ep -= 512;

+#ifndef        vax

        brk(ep -= 512); /* for recursion */
        brk(ep -= 512); /* for recursion */

+#endif

        a = ep - (char*)lspace;
        nlines = (a-L);
        nlines /= (5*(sizeof(char *)/sizeof(char)));
        a = ep - (char*)lspace;
        nlines = (a-L);
        nlines /= (5*(sizeof(char *)/sizeof(char)));

-       ntext = nlines*8;
+       ntext = nlines * 4 * (sizeof(char *)/sizeof(char));

        tspace = (char *)(lspace + nlines);
        a = -1;
        for(dirs=dirtry; *dirs; dirs++) {
        tspace = (char *)(lspace + nlines);
        a = -1;
        for(dirs=dirtry; *dirs; dirs++) {


@@ -538,7 +546,7 @@ cant(f)
 char *f;
 {
 
 char *f;
 {
 

-       diag("can't open ",f);
+       perror(f);

        term();
 }
 
        term();
 }
 


@@ -820,12 +828,14 @@ char **ppa;
        return(n);
 }
 
        return(n);
 }
 

+#ifndef        blank

 blank(c)
 {
        if(c==' ' || c=='\t')
                return(1);
        return(0);
 }
 blank(c)
 {
        if(c==' ' || c=='\t')
                return(1);
        return(0);
 }

+#endif

 
 #define qsexc(p,q) t= *p;*p= *q;*q=t
 #define qstexc(p,q,r) t= *p;*p= *r;*r= *q;*q=t
 
 #define qsexc(p,q) t= *p;*p= *q;*q=t
 #define qstexc(p,q,r) t= *p;*p= *r;*r= *q;*q=t