 @@ -1,202 +1,210 @@
-$NetBSD: patch-files.c,v 1.1 2023/03/01 23:48:00 vins Exp $
+$NetBSD: patch-files.c,v 1.2 2023/03/08 21:46:44 vins Exp $
 Pull patches from Debian.
 --- files.c.orig	1994-05-19 02:01:06.000000000 +0000
 +++ files.c
 @@ -1,9 +1,10 @@
 -#ifndef lint
 -static char rcsid[] = "files.c,v 2.0 1994/05/19 02:01:06 dan Exp";
 +#if 0
 +static char rcsid[] __attribute__((unused)) = "files.c,v 2.0 1994/05/19 02:01:06 dan Exp";
  #endif
  /*
   * Copyright (c) 1994    Daniel Williams
 + * Copyright (c) 2003    Erik de Castro Lopo
+  *
   * The X Consortium, and any party obtaining a copy of these files from
   * the X Consortium, directly or indirectly, is granted, free of charge,
-@@ -83,16 +84,18 @@ static void popup_cb (Widget w, XtPointe
+@@ -36,6 +37,7 @@ static char rcsid[] = "files.c,v 2.0 199
  #include <unistd.h>
  #include <errno.h>
  #include <sys/stat.h>
 +#include <sys/types.h>
  #include <ctype.h>
  #include <assert.h>
@@ -83,16 +85,18 @@ static void popup_cb (Widget w, XtPointe
   */
  static int is_ascii_text (char *filename)
+ {
 -    int fd, bytes, i;
 +    int fd, bytes, i, ch;
      char buffer[1024];
      fd = open (filename, O_RDONLY);
      bytes = read (fd, (void *) buffer, 1024);
      (void) close (fd);
 -    for (i = 0; i < bytes; i++)
 -	if (!isascii (buffer[i]))
 +    for (i = 0; i < bytes; i++) {
 +	ch = buffer [i];
 +	if (!isallowed(ch))
  	    return (0);
 +    }
      return (1);
+ }
-@@ -143,12 +146,13 @@ void werror (Widget parent, char *title,
+@@ -143,12 +147,13 @@ void werror (Widget parent, char *title,
      XmString xms;
      Arg args[2];
 -    (void) sprintf (buffer, "%s: %s", msg1, msg2);
 +    (void) snprintf (buffer, sizeof (buffer), "%s: %s", msg1, msg2);
      xms = XmStringCreateLtoR (buffer, XmSTRING_DEFAULT_CHARSET);
      XtSetArg (args[0], XmNmessageString, xms);
      XtSetArg (args[1], XmNdialogStyle, XmDIALOG_PRIMARY_APPLICATION_MODAL);
      dialog = XmCreateErrorDialog (parent, "werror", args, 2);
 -    XmStringFree (xms);
 +    if (xms)
 +	XmStringFree (xms);
      XtVaSetValues (XtParent (dialog), XtNtitle, title, NULL);
      XtUnmanageChild (XmMessageBoxGetChild (dialog, XmDIALOG_CANCEL_BUTTON));
-@@ -174,8 +178,10 @@ void werror_long (Widget parent, char *t
+@@ -174,8 +179,10 @@ void werror_long (Widget parent, char *t
  	    xms1 = xms4;
  	else {
  	    xms2 = XmStringConcat (xms1, xms4);
 -	    XmStringFree (xms4);
 -	    XmStringFree (xms1);
 +	    if (xms4)
 +		XmStringFree (xms4);
 +	    if (xms1)
 +		XmStringFree (xms1);
  	    xms1 = xms2;
+ 	}
-@@ -183,16 +189,19 @@ void werror_long (Widget parent, char *t
+@@ -183,16 +190,19 @@ void werror_long (Widget parent, char *t
  	    XmString xms3;
  	    xms3 = XmStringConcat (xms1, sep);
 -	    XmStringFree (xms1);
 +	    if (xms1)
 +		XmStringFree (xms1);
  	    xms1 = xms3;
+ 	}
+     }
 -    XmStringFree (sep);
 +    if (sep)
 +	XmStringFree (sep);
      XtSetArg (args[0], XmNmessageString, xms1);
      XtSetArg (args[1], XmNdialogStyle, XmDIALOG_PRIMARY_APPLICATION_MODAL);
      dialog = XmCreateErrorDialog (parent, "werror", args, 2);
 -    XmStringFree (xms1);
 +    if (xms1)
 +	XmStringFree (xms1);
      XtVaSetValues (XtParent (dialog), XtNtitle, title, NULL);
      XtUnmanageChild (XmMessageBoxGetChild (dialog, XmDIALOG_CANCEL_BUTTON));
      XtUnmanageChild (XmMessageBoxGetChild (dialog, XmDIALOG_HELP_BUTTON));
-@@ -318,7 +327,7 @@ void open_both_files (Widget parent, cha
+@@ -318,7 +328,7 @@ void open_both_files (Widget parent, cha
      Arg args[2];
      int i;
      char *dir;
 -    XmString xms;
 +    XmString xms = (XmString)0;
      shell = XtVaCreatePopupShell ("openfiles", xmDialogShellWidgetClass, parent,
  				  XmNallowShellResize, True,
-@@ -349,7 +358,8 @@ void open_both_files (Widget parent, cha
+@@ -349,7 +359,8 @@ void open_both_files (Widget parent, cha
      fsb1 = XmCreateFileSelectionBox (frame1a, "files1", args, i);
      if (dir) {
  	XtFree (dir);
 -	XmStringFree (xms);
 +	if (xms)
 +	    XmStringFree (xms);
+     }
      i = 0;
-@@ -360,7 +370,8 @@ void open_both_files (Widget parent, cha
+@@ -360,7 +371,8 @@ void open_both_files (Widget parent, cha
      fsb2 = XmCreateFileSelectionBox (frame2a, "files2", args, i);
      if (dir) {
  	XtFree (dir);
 -	XmStringFree (xms);
 +	if (xms)
 +	    XmStringFree (xms);
+     }
      XtAddCallback (fsb1, XmNokCallback, filel_both_cb, shell);
-@@ -424,7 +435,7 @@ void open_left_file (Widget parent, char
+@@ -424,7 +436,7 @@ void open_left_file (Widget parent, char
      Arg args[2];
      int i;
      char *dir;
 -    XmString xms;
 +    XmString xms = (XmString)0;
      i = 0;
      XtSetArg (args[i], XmNdeleteResponse, XmDO_NOTHING); i++;
-@@ -435,7 +446,8 @@ void open_left_file (Widget parent, char
+@@ -435,7 +447,8 @@ void open_left_file (Widget parent, char
      dialog = XmCreateFileSelectionDialog (parent, "openfile", args, i);
      if (dir) {
  	XtFree (dir);
 -	XmStringFree (xms);
 +	if (xms)
 +	    XmStringFree (xms);
+     }
      XtAddCallback (XtParent (dialog), XmNpopupCallback, popup_cb, parent);
      XtAddCallback (dialog, XmNokCallback, file_left_cb, dialog);
-@@ -477,7 +489,7 @@ void open_right_file (Widget parent, cha
+@@ -477,7 +490,7 @@ void open_right_file (Widget parent, cha
      Arg args[2];
      int i;
      char *dir;
 -    XmString xms;
 +    XmString xms = (XmString)0;
      i = 0;
      XtSetArg (args[i], XmNdeleteResponse, XmDO_NOTHING); i++;
-@@ -488,7 +500,8 @@ void open_right_file (Widget parent, cha
+@@ -488,7 +501,8 @@ void open_right_file (Widget parent, cha
      dialog = XmCreateFileSelectionDialog (parent, "openfile", args, XtNumber (args));
      if (dir) {
  	XtFree (dir);
 -	XmStringFree (xms);
 +	if (xms)
 +	    XmStringFree (xms);
+     }
      XtAddCallback (XtParent (dialog), XmNpopupCallback, popup_cb, parent);
-@@ -533,7 +546,7 @@ static void file_save_cb (Widget w, XtPo
+@@ -533,7 +547,7 @@ static void file_save_cb (Widget w, XtPo
      if (access (filename, W_OK) == 0) {	/* file exists and can be written */
  	char buffer[1024];
 -	(void) sprintf (buffer, "Overwrite \"%s\"?", filename);
 +	(void) snprintf (buffer, sizeof (buffer), "Overwrite \"%s\"?", filename);
  	if (modal_question (w, "Mgdiff Save Question", buffer)) {
  	    set_cursor (shell);
  	    if ((status = really_save_file (filename, (Block *) closure)) != 0) {
-@@ -569,7 +582,7 @@ void save_file (Widget parent, Block *b,
+@@ -569,7 +583,7 @@ void save_file (Widget parent, Block *b,
      Arg args[3];
      int i;
      char *dir;
 -    XmString xms;
 +    XmString xms = (XmString)0;
      i = 0;
      XtSetArg (args[i], XmNdialogStyle, XmDIALOG_PRIMARY_APPLICATION_MODAL); i++;
-@@ -582,7 +595,8 @@ void save_file (Widget parent, Block *b,
+@@ -582,7 +596,8 @@ void save_file (Widget parent, Block *b,
      dialog = XmCreateFileSelectionDialog (parent, "savefile", args, i);
      if (dir) {
  	XtFree (dir);
 -	XmStringFree (xms);
 +	if (xms)
 +	    XmStringFree (xms);
+     }
      XtAddCallback (XtParent (dialog), XmNpopupCallback, popup_cb, parent);
-@@ -618,18 +632,32 @@ static int really_save_file (char *filen
+@@ -618,18 +633,32 @@ static int really_save_file (char *filen
  		return (status);
+ 	}
  	else if ((b->arr[LEFT].type == DIFF) && (b->arr[RIGHT].type == DIFF)) {
 -	    assert (b->selected != NEITHER);
 +	    switch (b->selected) {
 +		case BOTH:
 +		    fprintf (file, "<<<<<<< diff from left file\n");
 +		    if ((status = write_chunk (file, &b->arr[LEFT])) != 0)
 +			return (status);
 +		    fprintf (file, "========\n");
 +		    if ((status = write_chunk (file, &b->arr[RIGHT])) != 0)
 +			return (status);
 +		    fprintf (file, ">>>>>>> diff from right file\n");
 @@ -212,27 +220,27 @@ Pull patches from Debian.
 +	    }
+ 	}
  	else if ((b->arr[LEFT].type == INSERT) && (b->arr[RIGHT].type == BLANK)) {
 -	    assert (b->selected != NEITHER);
  	    if (b->selected == LEFT)
  		if ((status = write_chunk (file, &b->arr[LEFT])) != 0)
  		    return (status);
+ 	}
  	else if ((b->arr[LEFT].type == BLANK) && (b->arr[RIGHT].type == INSERT)) {
 -	    assert (b->selected != NEITHER);
  	    if (b->selected == RIGHT)
  		if ((status = write_chunk (file, &b->arr[RIGHT])) != 0)
  		    return (status);
-@@ -669,3 +697,45 @@ static int write_chunk (FILE *file, Chun
+@@ -669,3 +698,45 @@ static int write_chunk (FILE *file, Chun
      return (0);
+ }
++
 +void save_as_filename (Widget parent, Block *closure, char *filename)
 +{
 +    char *title = "Mgdiff Save Error";
 +    int status;
 +    Widget shell = get_top_shell (parent);
++
 +    if (access (filename, W_OK) == 0) {
 +	/* file exists and can be written */
 +	char buffer[1024];

 @@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.4 2023/03/02 08:15:32 vins Exp $
+$NetBSD: distinfo,v 1.5 2023/03/08 21:46:44 vins Exp $
 BLAKE2s (mgdiff-1.0.1/mgdiff.tar.gz) = 7c90e00f9646d41e5e822055340fa41440acaa5ec0352606ccec1e14b43188de
 SHA512 (mgdiff-1.0.1/mgdiff.tar.gz) = bf5ab4b2a9d42ff2edb73a6dda68a4d17d88f61c63f5ec8366cc49d372a56f3c6812d473a95d86bcb61680d1f91ce4ab7ad87a26748b45e2edd27b73044492a5
 Size (mgdiff-1.0.1/mgdiff.tar.gz) = 41187 bytes
 SHA1 (patch-Imakefile) = 7c95728d50c4d835ceb330124eccce166c9e2845
 SHA1 (patch-Mgdiff.ad) = 1a3eade787f06b02c36bdc925a65ee0562f4d9f5
 SHA1 (patch-externs.h) = 8e536067c9834b8ef26a0210aaf8ece31004f310
-SHA1 (patch-files.c) = fa06ab3916e0d0a95551bea5e3320c9e577b3d7a
+SHA1 (patch-files.c) = 671cfd617d700e92d663e42834bc2c6d0dc1967e
 SHA1 (patch-legend.c) = 8933bc2938f94bc7c0c11009074517f017d4f8ee
 SHA1 (patch-manual.c) = 2f430240696d6eec22d5dd576c4577e5b7b4578d
 SHA1 (patch-mgdiff.c) = 773c0a4c1a10194fdc44da401c1eb40cae1233fc
 SHA1 (patch-mgdiff.h) = e7958ebd5ca1ccb17c7bcc7cf860d88e81f50cb4
 SHA1 (patch-mgdiff.man) = 65841f964644e7583ec0acb6601703cb44cf76f5
 SHA1 (patch-misc.c) = b6e1dd999f7fa5d013f3b6ad605f7c8c4cb4702e
 SHA1 (patch-modal.c) = 8c9e9e5c165c01f18ffb568367fa8c279a6913fc
 SHA1 (patch-patchlevel.h) = a9f3923649af2f99fdd4cce8148cc15ad6aaa626
 SHA1 (patch-rundiff.c) = 4c6360f13f1f9871b3a86afb476bfd041a290c58
 SHA1 (patch-spawn.c) = 3c9f8be777e47f485aef54511c2603adf4d26af3