summaryrefslogtreecommitdiff
path: root/community/mg/cleanup.patch
diff options
context:
space:
mode:
Diffstat (limited to 'community/mg/cleanup.patch')
-rw-r--r--community/mg/cleanup.patch187
1 files changed, 30 insertions, 157 deletions
diff --git a/community/mg/cleanup.patch b/community/mg/cleanup.patch
index 5a8e761cb..d4d29c50f 100644
--- a/community/mg/cleanup.patch
+++ b/community/mg/cleanup.patch
@@ -1,163 +1,36 @@
-Only in mg-20110120.my: autoexec.o
-Only in mg-20110120.my: basename.o
-Only in mg-20110120.my: basic.o
-Only in mg-20110120.my: buffer.o
-Only in mg-20110120.my: cinfo.o
-diff -wbBur mg-20110120/cmode.c mg-20110120.my/cmode.c
---- mg-20110120/cmode.c 2011-01-20 07:36:13.000000000 +0300
-+++ mg-20110120.my/cmode.c 2011-11-21 15:40:11.000000000 +0400
-@@ -158,7 +158,7 @@
- cc_indent(int f, int n)
+diff -wbBur mg-20130922/file.c mg-20130922.q/file.c
+--- mg-20130922/file.c 2013-09-22 13:09:36.000000000 +0400
++++ mg-20130922.q/file.c 2013-10-30 15:20:47.927840374 +0400
+@@ -669,9 +669,9 @@
{
- int pi, mi; /* Previous indents */
-- int ci, dci; /* current indent, don't care */
-+ int ci; /* current indent, don't care */
- struct line *lp;
- int ret;
-
-@@ -181,7 +181,7 @@
- /* Strip leading space on current line */
- delleadwhite(FFRAND, 1);
- /* current indent is computed only to current position */
-- dci = getindent(curwp->w_dotp, &ci);
-+ getindent(curwp->w_dotp, &ci);
-
- if (pi + ci < 0)
- ret = indent(FFOTHARG, 0);
-@@ -217,7 +217,6 @@
- {
- int lo, co; /* leading space, current offset*/
- int nicol = 0; /* position count */
-- int ccol = 0; /* current column */
- int c = '\0'; /* current char */
- int newind = 0; /* new index value */
- int stringp = FALSE; /* in string? */
-@@ -226,7 +225,6 @@
- int nparen = 0; /* paren count */
- int obrace = 0; /* open brace count */
- int cbrace = 0; /* close brace count */
-- int contp = FALSE; /* Continue? */
- int firstnwsp = FALSE; /* First nonspace encountered? */
- int colonp = FALSE; /* Did we see a colon? */
- int questionp = FALSE; /* Did we see a question mark? */
-@@ -256,13 +254,11 @@
- nicol = 0;
+ struct stat statbuf;
+ int s;
+- char *dp;
++ char *dp = malloc(strlen(fn) + 1);
- newind = 0;
-- ccol = nicol; /* current column */
- /* Compute modifiers */
- for (co = lo; co < llength(lp); co++) {
- c = lgetc(lp, co);
- /* We have a non-whitespace char */
- if (!firstnwsp && !isspace(c)) {
-- contp = TRUE;
- if (c == '#')
- cppp = TRUE;
- firstnwsp = TRUE;
-@@ -285,7 +281,6 @@
- } else if (c == '{') {
- obrace++;
- firstnwsp = FALSE;
-- contp = FALSE;
- } else if (c == '}') {
- cbrace++;
- } else if (c == '?') {
-@@ -294,9 +289,6 @@
- /* ignore (foo ? bar : baz) construct */
- if (!questionp)
- colonp = TRUE;
-- } else if (c == ';') {
-- if (nparen > 0)
-- contp = FALSE;
- } else if (c == '/') {
- /* first nonwhitespace? -> indent */
- if (firstnwsp) {
-Only in mg-20110120.my: cmode.o
-diff -wbBur mg-20110120/config.h mg-20110120.my/config.h
---- mg-20110120/config.h 2011-01-20 07:37:40.000000000 +0300
-+++ mg-20110120.my/config.h 2011-11-21 15:39:43.000000000 +0400
-@@ -7,4 +7,8 @@
- #ifndef MAXLOGNAME
- #define MAXLOGNAME LOGIN_NAME_MAX
- #endif
--#define HAVE_ARC4RANDOM
-+#define HAVE_NOSTRTONUM
-+#define HAVE_NOSTRLCPY
-+#define HAVE_NOSTRLCAT
-+#define HAVE_NOFGETLN
-+#define GNU_LS
-Only in mg-20110120.my: config.log
-Only in mg-20110120.my: dired.o
-Only in mg-20110120.my: dirname.o
-Only in mg-20110120.my: dir.o
-Only in mg-20110120.my: display.o
-Only in mg-20110120.my: echo.o
-Only in mg-20110120.my: extend.o
-Only in mg-20110120.my: fgetln.o
-diff -wbBur mg-20110120/fileio.c mg-20110120.my/fileio.c
---- mg-20110120/fileio.c 2008-12-30 19:04:23.000000000 +0300
-+++ mg-20110120.my/fileio.c 2011-11-21 15:43:12.000000000 +0400
-@@ -121,10 +121,8 @@
- * future writes will do the same thing.
- */
- if (bp && bp->b_fi.fi_mode) {
-- int ret;
--
- fchmod(fd, bp->b_fi.fi_mode & 07777);
-- ret = fchown(fd, bp->b_fi.fi_uid, bp->b_fi.fi_gid);
-+ (void)fchown(fd, bp->b_fi.fi_uid, bp->b_fi.fi_gid);
- }
- return (FIOSUC);
- }
-Only in mg-20110120.my: fileio.o
-Only in mg-20110120.my: file.o
-Only in mg-20110120.my: funmap.o
-Only in mg-20110120.my: grep.o
-Only in mg-20110120.my: help.o
-Only in mg-20110120.my: kbd.o
-Only in mg-20110120.my: keymap.o
-Only in mg-20110120.my: line.o
-Only in mg-20110120.my: macro.o
-Only in mg-20110120.my: main.o
-Only in mg-20110120.my: Makefile
-Only in mg-20110120.my: match.o
-Only in mg-20110120.my: mg
-Only in mg-20110120.my: modes.o
-Only in mg-20110120.my: paragraph.o
-Only in mg-20110120.my: random.o
-Only in mg-20110120.my: region.o
-Only in mg-20110120.my: re_search.o
-Only in mg-20110120.my: search.o
-Only in mg-20110120.my: spawn.o
-Only in mg-20110120.my: strlcat.o
-Only in mg-20110120.my: strlcpy.o
-Only in mg-20110120.my: strtonum.o
-Only in mg-20110120.my: theo.o
-Only in mg-20110120.my: ttyio.o
-Only in mg-20110120.my: ttykbd.o
-Only in mg-20110120.my: tty.o
-diff -wbBur mg-20110120/undo.c mg-20110120.my/undo.c
---- mg-20110120/undo.c 2011-01-03 01:57:57.000000000 +0300
-+++ mg-20110120.my/undo.c 2011-11-21 15:41:05.000000000 +0400
-@@ -464,14 +464,14 @@
- struct undo_rec *ptr, *nptr;
- int done, rval;
- struct line *lp;
-- int offset, save, dot;
-+ int offset, save;
- static int nulled = FALSE;
- int lineno;
+- dp = dirname(fn);
++ xdirname(dp, fn, strlen(fn));
- if (n < 0)
- return (FALSE);
+ if (stat(fn, &statbuf) == -1 && errno == ENOENT) {
+ errno = 0;
+diff -wbBur mg-20130922/Makefile mg-20130922.q/Makefile
+--- mg-20130922/Makefile 2013-09-22 18:06:43.000000000 +0400
++++ mg-20130922.q/Makefile 2013-10-30 15:20:34.201173866 +0400
+@@ -4,7 +4,7 @@
+ NOGCCERROR= true
+ PROG= mg
-- dot = find_dot(curwp->w_dotp, curwp->w_doto);
-+ find_dot(curwp->w_dotp, curwp->w_doto);
+-LDADD+= -lcurses -lutil -lclens
++LDADD+= -lcurses -lutil -lclens -lbsd
+ DPADD+= ${LIBCURSES} ${LIBUTIL}
- ptr = curbp->b_undoptr;
+ # (Common) compile-time options:
+@@ -17,7 +17,7 @@
+ #
+ CFLAGS = -O2
+ CFLAGS += -Wall -DFKEYS -DREGEX -DXKEYS
+-CFLAGS += -I/usr/local/include/clens
++CFLAGS += -I/usr/include/clens -isystem /usr/include/bsd -DLIBBSD_OVERLAY
-Only in mg-20110120.my: undo.o
-Only in mg-20110120.my: version.o
-Only in mg-20110120.my: window.o
-Only in mg-20110120.my: word.o
-Only in mg-20110120.my: yank.o
+ SRCS= autoexec.c basic.c bell.c buffer.c cinfo.c dir.c display.c \
+ echo.c extend.c file.c fileio.c funmap.c help.c kbd.c keymap.c \
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-05 20:26:23 +0000