diff options
| author | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2004-08-17 01:11:03 +0000 |
|---|---|---|
| committer | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2004-08-17 01:11:03 +0000 |
| commit | 287b20ed2ed929ca7e7552689d7a07c6b5443120 (patch) | |
| tree | 5e77de69d74d78523fd4616418776acafb50fa2d /misc | |
| parent | Update to 1.46. (diff) | |
Fix the build on -current.
Notes
Notes:
svn path=/head/; revision=116452
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/mshell/Makefile | 1 | ||||
| -rw-r--r-- | misc/mshell/files/patch-ae | 52 | ||||
| -rw-r--r-- | misc/mshell/files/patch-ah | 10 |
3 files changed, 31 insertions, 32 deletions
diff --git a/misc/mshell/Makefile b/misc/mshell/Makefile index 921c2149067a..3ddebce88e1e 100644 --- a/misc/mshell/Makefile +++ b/misc/mshell/Makefile @@ -7,6 +7,7 @@ PORTNAME= mshell PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= jmz diff --git a/misc/mshell/files/patch-ae b/misc/mshell/files/patch-ae index 928f9c25b1d7..1ef8f2694bb4 100644 --- a/misc/mshell/files/patch-ae +++ b/misc/mshell/files/patch-ae @@ -1,22 +1,30 @@ -*** string.c.orig Fri Sep 23 18:34:06 1994 ---- string.c Fri Sep 23 18:50:39 1994 -*************** -*** 4,9 **** ---- 4,20 ---- - #define strchr index - #endif - -+ char * -+ gets (char *s) -+ { -+ char *x = fgets (s, WORDLEN, stdin); -+ if (x) { -+ char *p = strchr (x, '\n'); -+ if (p) -+ *p = 0; -+ } -+ return x; -+ } - - /* function to find the position of sub_string in main_string - * ---------------------------------------------------------- */ +--- string.c~ Tue Aug 17 03:06:07 2004 ++++ string.c Tue Aug 17 03:06:28 2004 +@@ -4,6 +4,19 @@ + #define strchr index + #endif + ++char * strsave(char *); ++ ++char * ++gets (char *s) ++{ ++ char *x = fgets (s, WORDLEN, stdin); ++ if (x) { ++ char *p = strchr (x, '\n'); ++ if (p) ++ *p = 0; ++ } ++ return x; ++} + + /* function to find the position of sub_string in main_string + * ---------------------------------------------------------- */ +@@ -260,7 +273,6 @@ + /* if it has a multi-command delim, save rest for next time */ + #define MULTI_CMD_DELIM ',' + if (p = index(string, MULTI_CMD_DELIM)) { +- char *strsave(); + struct inp_link *l; + *p++ = EOS; + if ((l=getnode(sizeof(*l))) && (l->input=strsave(p))) diff --git a/misc/mshell/files/patch-ah b/misc/mshell/files/patch-ah deleted file mode 100644 index 899850821144..000000000000 --- a/misc/mshell/files/patch-ah +++ /dev/null @@ -1,10 +0,0 @@ ---- string.c.orig Sun Oct 20 16:14:00 2002 -+++ string.c Sun Oct 20 16:14:08 2002 -@@ -271,7 +271,6 @@ - /* if it has a multi-command delim, save rest for next time */ - #define MULTI_CMD_DELIM ',' - if (p = index(string, MULTI_CMD_DELIM)) { -- char *strsave(); - struct inp_link *l; - *p++ = EOS; - if ((l=getnode(sizeof(*l))) && (l->input=strsave(p))) |