must rm before ln

[unix-history] / usr / src / usr.bin / error / subr.c

diff --git a/usr/src/usr.bin/error/subr.c b/usr/src/usr.bin/error/subr.c
index 30a95e7..131a708 100644 (file)
--- a/usr/src/usr.bin/error/subr.c
+++ b/usr/src/usr.bin/error/subr.c
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)subr.c      1.2 (Berkeley) %G%";
+static char *sccsid = "@(#)subr.c      1.4 (Berkeley) %G%";

 #include <stdio.h>
 #include <ctype.h>
 #include "error.h"
 #include <stdio.h>
 #include <ctype.h>
 #include "error.h"


@@ -71,6 +71,7 @@ int position(string, ch)
        reg     char    ch;
 {
        reg     int     i;
        reg     char    ch;
 {
        reg     int     i;

+       if (string)

        for (i=1; *string; string++, i++){
                if (*string == ch)
                        return(i);
        for (i=1; *string; string++, i++){
                if (*string == ch)
                        return(i);


@@ -86,6 +87,7 @@ char *substitute(string, chold, chnew)
 {
        reg     char    *cp = string;
 
 {
        reg     char    *cp = string;
 

+       if (cp)

        while (*cp){
                if (*cp == chold){
                        *cp = chnew;
        while (*cp){
                if (*cp == chold){
                        *cp = chnew;


@@ -100,6 +102,7 @@ char lastchar(string)
        char    *string;
 {
        int     length;
        char    *string;
 {
        int     length;

+       if (string == 0) return('\0');

        length = strlen(string);
        if (length >= 1)
                return(string[length-1]);
        length = strlen(string);
        if (length >= 1)
                return(string[length-1]);


@@ -110,13 +113,17 @@ char lastchar(string)
 char firstchar(string)
        char    *string;
 {
 char firstchar(string)
        char    *string;
 {

-       return(string[0]);
+       if (string)
+               return(string[0]);
+       else
+               return('\0');

 }
 
 char   next_lastchar(string)
        char    *string;
 {
        int     length;
 }
 
 char   next_lastchar(string)
        char    *string;
 {
        int     length;

+       if (string == 0) return('\0');

        length = strlen(string);
        if (length >= 2)
                return(string[length - 2]);
        length = strlen(string);
        if (length >= 2)
                return(string[length - 2]);


@@ -127,8 +134,9 @@ char        next_lastchar(string)
 clob_last(string, newstuff)
        char    *string, newstuff;
 {
 clob_last(string, newstuff)
        char    *string, newstuff;
 {

-       int     length;
-       length = strlen(string);
+       int     length = 0;
+       if (string)
+               length = strlen(string);

        if (length >= 1)
                string[length - 1] = newstuff;
 }
        if (length >= 1)
                string[length - 1] = newstuff;
 }


@@ -142,9 +150,10 @@ boolean persperdexplode(string, r_perd, r_pers)
        char    **r_perd, **r_pers;
 {
        reg     char    *cp;
        char    **r_perd, **r_pers;
 {
        reg     char    *cp;

-               int     length;
+               int     length = 0;

 
 

-       length = strlen(string);
+       if (string)
+               length = strlen(string);

        if (   (length >= 4)
            && (string[length - 1] == ')' ) ){
                for (cp = &string[length - 2];
        if (   (length >= 4)
            && (string[length - 1] == ')' ) ){
                for (cp = &string[length - 2];


@@ -172,9 +181,10 @@ boolean qpersperdexplode(string, r_perd, r_pers)
        char    **r_perd, **r_pers;
 {
        reg     char    *cp;
        char    **r_perd, **r_pers;
 {
        reg     char    *cp;

-               int     length;
+               int     length = 0;

 
 

-       length = strlen(string);
+       if (string)
+               length = strlen(string);

        if (   (length >= 4)
            && (string[length - 1] == ')' ) ){
                for (cp = &string[length - 2];
        if (   (length >= 4)
            && (string[length - 1] == ')' ) ){
                for (cp = &string[length - 2];


@@ -204,6 +214,8 @@ static      char    pioutcomment[] = PIOUTCOMMENT;
 static char    lispincomment[] = LISPINCOMMENT;
 static char    riincomment[] = RIINCOMMENT;
 static char    rioutcomment[] = RIOUTCOMMENT;
 static char    lispincomment[] = LISPINCOMMENT;
 static char    riincomment[] = RIINCOMMENT;
 static char    rioutcomment[] = RIOUTCOMMENT;

+static char    troffincomment[] = TROFFINCOMMENT;
+static char    troffoutcomment[] = TROFFOUTCOMMENT;

 
 struct lang_desc lang_table[] = {
        /*INUNKNOWN     0*/     "unknown", cincomment,  coutcomment,
 
 struct lang_desc lang_table[] = {
        /*INUNKNOWN     0*/     "unknown", cincomment,  coutcomment,


@@ -224,6 +236,7 @@ struct      lang_desc lang_table[] = {
        /*INAPL         15*/    "apl",  ".lm",         newline,
        /*INMAKE        16*/    "make", ASINCOMMENT,   newline,
        /*INRI          17*/    "ri",   riincomment,   rioutcomment,
        /*INAPL         15*/    "apl",  ".lm",         newline,
        /*INMAKE        16*/    "make", ASINCOMMENT,   newline,
        /*INRI          17*/    "ri",   riincomment,   rioutcomment,

+       /*INTROFF       18*/    "troff",troffincomment,troffoutcomment,

                                0,      0,           0
 };
 
                                0,      0,           0
 };
 


@@ -319,6 +332,8 @@ int wordvcmp(wordv1, wordc, wordv2)
        reg     int i;
                int     back;
        for (i = 0; i < wordc; i++){
        reg     int i;
                int     back;
        for (i = 0; i < wordc; i++){

+               if (wordv1[i] == 0 || wordv2[i] == 0)
+                               return(-1);

                if (back = strcmp(wordv1[i], wordv2[i])){
                        return(back);
                }
                if (back = strcmp(wordv1[i], wordv2[i])){
                        return(back);
                }