 @@ -1,14 +1,14 @@
-$NetBSD: patch-mgdiff.man,v 1.1 2023/03/01 23:48:00 vins Exp $
+$NetBSD: patch-mgdiff.man,v 1.2 2023/03/02 08:15:32 vins Exp $
 Pull patches from Debian.
 --- mgdiff.man.orig	1994-05-19 02:01:16.000000000 +0000
 +++ mgdiff.man
 @@ -1,6 +1,7 @@
  .\" mgdiff.man,v 2.0 1994/05/19 02:01:16 dan Exp
  .\"
  .\" 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,
 @@ -23,27 +23,38 @@ Pull patches from Debian.
 +current version allows the user to select both sides of a difference
 +by selecting blocks using the middle mouse button.  When both sides of a
 +difference are selected both blocks will be saved to the merged file and
 +marked in a similar manner to the way
 +.I CVS
 +marks merges that require manual resolution of conflicting changes.  In
 +addition, the current version also allows saving of a merged file with
 +unselected blocks.  In this case, the merged file will contain
 +neither the left hand side nor the right hand side of the unselected
 +blocks.
  .SH COMMAND LINE OPTIONS
  .TP 8
-@@ -170,8 +185,27 @@ specify an output file for writing the m
+@@ -162,6 +177,10 @@ file.
  Brings up the "Open File" FileSelectionDialog to allow the user to
  specify a file to open and compare with the already opened left\-hand
  file.
 +.IP "\fBReload Both\fP" \n(XYP
 +.B Meta+R
 +.LP
 +Re-runs diff on both the currently opened files.
  .IP "\fBSave As...\fP" \n(XYP
  .B Ctrl+S
  .LP
@@ -170,8 +189,27 @@ specify an output file for writing the m
  application modal dialog.  The program will allow the user to
  overwrite an existing file but pops up a QuestionDialog to allow the
  user to cancel the operation if desired.  If there are any unselected
 -areas of difference between the two files the user is notified via an
 -ErrorDialog and the save operation is canceled.
 +areas of difference between the two files the user is asked whether
 +they want to continue or cancel the operation.  If the user continues,
 +the output file will contain none of the unselected blocks.
 +.IP "\fBSave As Left...\fP" \n(XYP
 +.LP
 +Saves the merged file to the location given by the left hand side
 +file location. The user will be asked if they are sure they wish the
 +existing file to be overwritten. As with the "Save As", if there are
 @@ -53,37 +64,41 @@ Pull patches from Debian.
 +unselected blocks.
 +.IP "\fBSave As Right...\fP" \n(XYP
 +.LP
 +Saves the merged file to the location given by the right hand side
 +file location. The user will be asked if they are sure they wish the
 +existing file to be overwritten. As with the "Save As", if there are
 +any unselected areas of difference between the two files the user
 +asked whether they want to continue or cancel the operation.  If the
 +user continues, the output file will contain none of the data in the
 +unselected blocks.
  .IP "\fBExit\fP" \n(XYP
  .B Ctrl+C
  .LP
-@@ -332,6 +366,9 @@ Mgdiff  mgdiff
+@@ -330,8 +368,12 @@ Mgdiff  mgdiff
  					XmPushButtonGadget  button_1
  					XmPushButtonGadget  button_2
  					XmPushButtonGadget  button_3
- 					XmSeparatorGadget  separator_0
+-					XmSeparatorGadget  separator_0
  					XmPushButtonGadget  button_4
 +					XmSeparatorGadget  separator_0
 +					XmPushButtonGadget  button_5
 +					XmSeparatorGadget  separator_1
 +					XmPushButtonGadget  button_6
 +					XmSeparatorGadget  separator_1
 +					XmPushButtonGadget  button_7
  				XmRowColumn  options_menu
  					XmToggleButtonGadget  button_0
  					XmToggleButtonGadget  button_1
-@@ -543,12 +580,17 @@ command assumes arguments are delimited
+@@ -543,12 +585,17 @@ command assumes arguments are delimited
  any quote processing.
  .SH COPYRIGHT
  Copyright (c) 1994, Daniel Williams
 +.br
 +Copyright (c) 2003, Erik de Castro Lopo
  .br
  See
  .B X (1)
  for a full statement of rights and permissions.
 -.SH AUTHOR
 +.SH AUTHORS
  Daniel Williams (dan@sass.com)
 +.br

 @@ -1,14 +1,14 @@
-$NetBSD: patch-mgdiff.c,v 1.3 2023/03/01 23:48:00 vins Exp $
+$NetBSD: patch-mgdiff.c,v 1.4 2023/03/02 08:15:32 vins Exp $
 Prevent unsafe use of tmpnam().
 Pull patches from Debian.
 --- mgdiff.c.orig	1994-09-29 01:56:53.000000000 +0000
 +++ mgdiff.c
 @@ -1,13 +1,14 @@
 -#ifndef lint
 -static char rcsid[] = "mgdiff.c,v 2.1 1994/09/29 01:56:53 dan Exp";
 +#if 0
 +static char rcsid[] __attribute__((unused)) = "mgdiff.c,v 2.1 1994/09/29 01:56:53 dan Exp";
  #endif
 @@ -118,27 +118,27 @@ Pull patches from Debian.
   * anyway) and less complex than turning on and correctly processing
   * GraphicsExpose events.
   */
 -static int statel = VisibilityFullyObscured;
 -static int stater = VisibilityFullyObscured;
++
 +/* Make the initial state unobscured. */
 +static int statel = VisibilityUnobscured;
 +static int stater = VisibilityUnobscured;
++
  /* ARGSUSED1 */
  static void Visible (Widget widget, XtPointer closure, XEvent *event, Boolean *continue_to_dispatch)
 @@ -398,23 +420,37 @@ static void drawit (Widget w, XtPointer
      Region region;
      Block *b;
      GC fore, back;
 -    int columns;
+-
 +    int columns, widget_side;
++
 +    Side x_selection = NEITHER;
 +    Block *curr_x_block = newss.lastSelected;
++
 +    if (curr_x_block) {
 +	x_selection = curr_x_block->selected;
 +    }
 @@ -160,385 +160,434 @@ Pull patches from Debian.
      for (b = newss.b; b != NULL; b = b->next) {
  	int j;
  	Chunk *ths, *oth;
 -	if (w == textl) {
 +	if (widget_side == WIDGET_LEFT) {
  	    ths = &b->arr[LEFT];
  	    oth = &b->arr[RIGHT];
 -	    if (b->selected == LEFT) {
 +	    if (b->selected == LEFT || b->selected == BOTH) {
  		fore = gcfore[4];
  		back = gcback[4];
+ 	    }
 @@ -423,10 +459,10 @@ static void drawit (Widget w, XtPointer
  		back = gcback[ths->type];
+ 	    }
+ 	}
 -	else if (w == textr) {
 +	else if (widget_side == WIDGET_RIGHT) {
  	    ths = &b->arr[RIGHT];
  	    oth = &b->arr[LEFT];
 -	    if (b->selected == RIGHT) {
 +	    if (b->selected == RIGHT || b->selected == BOTH) {
  		fore = gcfore[4];
  		back = gcback[4];
+ 	    }
 @@ -520,7 +556,7 @@ static void drawit (Widget w, XtPointer
  /* ARGSUSED */
  static void file_cb (Widget w, XtPointer closure, XtPointer call_data)
+ {
 -    switch ((int) closure) {
 +    switch ((intptr_t) closure) {
      case 0:			/* open */
  	toggle_open_sensitive (False);
  	set_cursor (toplevel);
-@@ -537,15 +573,32 @@ static void file_cb (Widget w, XtPointer
+@@ -536,16 +572,36 @@ static void file_cb (Widget w, XtPointer
  	set_cursor (toplevel);
  	open_right_file (toplevel, str_fnamer);
  	break;
-     case 3:			/* save as */
+-    case 3:			/* save as */
 -	if (all_selected ()) {
 -	    set_cursor (toplevel);
 -	    save_file (toplevel, di->first, str_fnamel);
 +    case 3:			/* refresh */
 +	reload_both();
 +	break;
 +    case 4:			/* save as */
 +	if (all_selected () == False) {
 +	    if (modal_question (toplevel, "Mgdiff Save", unselected_text_msg) == False)
 +		break;
+ 	}
 -	else {
 -	    werror (toplevel, "Save Error", "Save", "there are unselected text blocks");
 +	save_file (toplevel, di->first, str_fnamel);
 +	break;
-+	case 4:			/* save as left */
++	case 5:			/* save as left */
 +	if (all_selected () == False) {
 +	    if (modal_question (toplevel, "Mgdiff Save", unselected_text_msg) == False)
 +		break;
 +	}
 +	    set_cursor (toplevel);
 +	    save_as_filename (toplevel, di->first, str_fnamel);
 +	    reset_cursor (toplevel);
-+	break;
+ 	break;
-+	case 5:			/* save as right */
+-    case 4:			/* exit */
 +	case 6:			/* save as right */
 +	if (all_selected () == False) {
 +	    if (modal_question (toplevel, "Mgdiff Save", unselected_text_msg) == False)
 +		break;
 +	}
 +	    set_cursor (toplevel);
 +	    save_as_filename (toplevel, di->first, str_fnamer);
 +	    reset_cursor (toplevel);
++
- 	break;
++	break;
--    case 4:			/* exit */
++    case 7:			/* exit */
 +    case 6:			/* exit */
  	exit_cb (w, NULL, NULL);
  	break;
      default:
-@@ -560,7 +613,7 @@ static void file_cb (Widget w, XtPointer
+@@ -560,7 +616,7 @@ static void file_cb (Widget w, XtPointer
  /* ARGSUSED */
  static void view_cb (Widget w, XtPointer closure, XtPointer call_data)
+ {
 -    switch ((int) closure) {
 +    switch ((intptr_t) closure) {
      case 0:			/* previous */
  	prev_diff (NULL, NULL, NULL);
  	break;
-@@ -582,7 +635,7 @@ static void view_cb (Widget w, XtPointer
+@@ -582,7 +638,7 @@ static void view_cb (Widget w, XtPointer
  /* ARGSUSED */
  static void select_cb (Widget w, XtPointer closure, XtPointer call_data)
+ {
 -    switch ((int) closure) {
 +    switch ((intptr_t) closure) {
      case 0:			/* left */
  	select_all (LEFT);
  	break;
-@@ -604,7 +657,7 @@ static void select_cb (Widget w, XtPoint
+@@ -604,7 +660,7 @@ static void select_cb (Widget w, XtPoint
  /* ARGSUSED */
  static void options_cb (Widget w, XtPointer closure, XtPointer call_data)
+ {
 -    switch ((int) closure) {
 +    switch ((intptr_t) closure) {
      case 0:			/* toggle overview area */
  	overview_flag = !overview_flag;
  	if (overview_flag) {
-@@ -660,7 +713,7 @@ static void options_cb (Widget w, XtPoin
+@@ -660,7 +716,7 @@ static void options_cb (Widget w, XtPoin
  /* ARGSUSED */
  static void helpmenu_cb (Widget w, XtPointer closure, XtPointer call_data)
+ {
 -    switch ((int) closure) {
 +    switch ((intptr_t) closure) {
      case 0:			/* version */
  	show_version (toplevel);
  	break;
-@@ -724,7 +777,6 @@ static void set_pixmaps (WidgetList chil
+@@ -724,7 +780,6 @@ static void set_pixmaps (WidgetList chil
  	dagcb = XtGetGC (children[1], GCForeground|GCBackground, &gc_values);
  	been_here = 1;
+     }
+-
      for (i = 0; i < 3; i++) {
  	XtVaGetValues (children[i],
  		       XmNwidth, &width[i],
-@@ -755,7 +807,7 @@ static void set_pixmaps (WidgetList chil
+@@ -755,7 +810,7 @@ static void set_pixmaps (WidgetList chil
  	yfpos[LEFT] += b->arr[LEFT].fsize;
  	h = ((int) height[0] * yfpos[LEFT] / max (di->flines[LEFT], 1)) - y;
  	y3 = ((h == 0) ? y1 : (y1 + h - 1));
 -	back = (b->selected == LEFT) ? 4 : b->arr[LEFT].type;
 +	back = (b->selected == LEFT || b->selected == BOTH) ? 4 : b->arr[LEFT].type;
  	XFillRectangle (XtDisplay (children[0]), p[0], gcback[back],
 , y, width[0], h);
-@@ -763,7 +815,7 @@ static void set_pixmaps (WidgetList chil
+@@ -763,7 +818,7 @@ static void set_pixmaps (WidgetList chil
  	yfpos[RIGHT] += b->arr[RIGHT].fsize;
  	h = ((int) height[2] * yfpos[RIGHT] / max (di->flines[RIGHT], 1)) - y;
  	y4 = ((h == 0) ? y2 : (y2 + h - 1));
 -	back = (b->selected == RIGHT) ? 4 : b->arr[RIGHT].type;
 +	back = (b->selected == RIGHT || b->selected == BOTH) ? 4 : b->arr[RIGHT].type;
  	XFillRectangle (XtDisplay (children[2]), p[2], gcback[back],
 , y, width[2], h);
-@@ -906,6 +958,7 @@ static void add_actions (XtAppContext ap
+@@ -906,6 +961,7 @@ static void add_actions (XtAppContext ap
       */
      static char *foo3 = "\
  	<Btn1Down>: Select() \n\
 +	<Btn2Down>: Select() \n\
  	~Ctrl <Key>osfPageDown: Scroll(PageDown) \n\
  	~Ctrl <Key>osfPageUp: Scroll(PageUp) \n\
  	<Key>osfLeft: Scroll(Left) \n\
-@@ -951,8 +1004,9 @@ static void add_actions (XtAppContext ap
+@@ -951,8 +1007,9 @@ static void add_actions (XtAppContext ap
   */
  static void cleanup_at_exit (void)
+ {
 -    if (tempfname != NULL)
 +    if (strlen (tempfname) > 0)
  	(void) unlink (tempfname);
 +    tempfname [0] = 0 ;
+ }
  /*
-@@ -1017,8 +1071,11 @@ int main (int argc, char *argv[])
+@@ -1017,8 +1074,11 @@ int main (int argc, char *argv[])
      {"quitIfSame", "QuitIfSame", XtRBoolean, sizeof (Boolean), 0, XtRString, "false"},
      {"debug", "Debug", XtRBoolean, sizeof (Boolean), 0, XtRString, "false"},
      {"filename", "Filename", XtRString, sizeof (String), 0, XtRString, ""}};
+-
 +#if !(defined __GLIBC__ && __GLIBC__ >= 2)
 +    progname = mgdiff_basename (argv[0]);
 +#else
      progname = basename (argv[0]);
 +#endif
      toplevel = XtVaAppInitialize (&app, "Mgdiff", option_table, XtNumber (option_table),
  #if X11R5
-@@ -1027,6 +1084,10 @@ int main (int argc, char *argv[])
+@@ -1027,6 +1087,10 @@ int main (int argc, char *argv[])
  				  (unsigned int *) &argc,
  #endif
  				  argv, fallbacks, NULL);
 +    setlocale (LC_ALL, "");
 +    setlocale (LC_CTYPE, "POSIX");
 +    XtSetLanguageProc (app, NULL, NULL);
++
      XtVaGetValues (toplevel, XmNdepth, &depth, NULL);
      if (depth == 1)
-@@ -1079,7 +1140,6 @@ int main (int argc, char *argv[])
+@@ -1079,7 +1143,6 @@ int main (int argc, char *argv[])
  	};
  	werror_long (toplevel, "Wrong Application Defaults", array, sizeof (array) / sizeof (array[0]));
+     }
+-
      if (debug_flag) {
  	XSetErrorHandler (x_error_handler);
  	XtAppSetErrorHandler (app, xt_error_handler);
-@@ -1087,7 +1147,10 @@ int main (int argc, char *argv[])
+@@ -1087,7 +1150,10 @@ int main (int argc, char *argv[])
      else
  	XtAppSetWarningHandler (app, xt_warning_handler);
 -#if sun
 +#if 0
 +    /* May possibly be required on some old versions of SunOS.
 +    ** Definitely not required on Solaris.
 +    */
      (void) on_exit (cleanup_at_exit, NULL);
  #else
      (void) atexit (cleanup_at_exit);
-@@ -1109,14 +1172,17 @@ int main (int argc, char *argv[])
+@@ -1109,14 +1175,17 @@ int main (int argc, char *argv[])
  	 * two filenames on command line; process them
  	 */
      case 3:
 +	if (strcmp (argv[1], "-") == 0 && strcmp (argv[2], "-") == 0) {
 +		(void) fprintf (stderr, "Cannot use stdin for both file input\n");
 +		exit (2);
 +	}
  	if (strcmp (argv[1], "-") == 0) {
 -	    tempfname = tempnam (NULL, "mgdif");
 -	    str_fnamel = strdup (tempfname);
 -	    str_snamel = strdup (user_filename);
 -	    if (!copy_to_file (stdin, tempfname)) {
 +	    if (!copy_to_tempfile (stdin, tempfname, sizeof (tempfname))) {
  		(void) fprintf (stderr, "Error copying stdin to temp file \"%s\"\n", tempfname);
  		exit (2);
+ 	    }
 +	    str_fnamel = strdup (tempfname);
 +	    str_snamel = strdup (user_filename);
+ 	}
  	else if (!file_tests (toplevel, argv[1])) {
  	    no_files_flag = True;
-@@ -1131,13 +1197,12 @@ int main (int argc, char *argv[])
+@@ -1131,13 +1200,12 @@ int main (int argc, char *argv[])
+ 	}
  	if (strcmp (argv[2], "-") == 0) {
 -	    tempfname = tempnam (NULL, "mgdif");
 -	    str_fnamer = strdup (tempfname);
 -	    str_snamer = strdup (user_filename);
 -	    if (!copy_to_file (stdin, tempfname)) {
 +	    if (!copy_to_tempfile (stdin, tempfname, sizeof (tempfname))) {
  		(void) fprintf (stderr, "Error copying stdin to temp file \"%s\"\n", tempfname);
  		exit (2);
+ 	    }
 +	    str_fnamer = strdup (tempfname);
 +	    str_snamer = strdup (user_filename);
+ 	}
  	else if (!file_tests (toplevel, argv[2])) {
  	    no_files_flag = True;
-@@ -1174,6 +1239,7 @@ int main (int argc, char *argv[])
+@@ -1174,6 +1242,7 @@ int main (int argc, char *argv[])
+     }
      newss.b = di->first;
 +    newss.lastSelected= NULL;
      newss.topline = newss.sindex = newss.findex[LEFT] = newss.findex[RIGHT] = 0;
      mainw = XtVaCreateManagedWidget ("mainw", xmMainWindowWidgetClass,
-@@ -1205,10 +1271,13 @@ int main (int argc, char *argv[])
+@@ -1205,10 +1274,14 @@ int main (int argc, char *argv[])
  				  XmVaPUSHBUTTON, NULL, NULL, NULL, NULL,
  				  XmVaSEPARATOR,
  				  XmVaPUSHBUTTON, NULL, NULL, NULL, NULL,
 +				  XmVaPUSHBUTTON, NULL, NULL, NULL, NULL,
 +				  XmVaPUSHBUTTON, NULL, NULL, NULL, NULL,
 +				  XmVaSEPARATOR,
 +				  XmVaPUSHBUTTON, NULL, NULL, NULL, NULL,
  				  NULL);
      if (no_files_flag || (di->status == 2)) {
  	toggle_openlr_sensitive (False);
 -	toggle_saveas_sensitive (False);
 +	toggle_saveas_sensitive (False, False, False);
+     }
      XmVaCreateSimplePulldownMenu (menubar, "view_menu", 1, view_cb,
  				  XmVaPUSHBUTTON, NULL, NULL, NULL, NULL,
-@@ -1491,6 +1560,7 @@ int main (int argc, char *argv[])
+@@ -1491,6 +1564,7 @@ int main (int argc, char *argv[])
      XtAppMainLoop (app);
      /* NOTREACHED */
 +    return 0;
+ }
  static void redraw_partial_vert (Widget w)
-@@ -1622,9 +1692,9 @@ static void update_line_numbers (int l,
+@@ -1622,9 +1696,9 @@ static void update_line_numbers (int l,
+ {
      char buffer[16];
 -    (void) sprintf (buffer, "%*d", linenum_columns, l);
 +    (void) snprintf (buffer, sizeof (buffer), "%*d", linenum_columns, l);
      XmTextFieldSetString (linenuml, buffer);
 -    (void) sprintf (buffer, "%*d", linenum_columns, r);
 +    (void) snprintf (buffer, sizeof (buffer), "%*d", linenum_columns, r);
      XmTextFieldSetString (linenumr, buffer);
+ }
-@@ -1860,19 +1930,20 @@ static void next_diff (Widget w, XtPoint
+@@ -1860,19 +1934,20 @@ static void next_diff (Widget w, XtPoint
  	    value = (b->sline >= lines_of_context) ? (b->sline - lines_of_context) : b->sline;
  	    XtVaGetValues (sb, XmNmaximum, &maximum, XmNsliderSize, &slidersize, NULL);
 -	    if (value > (maximum - slidersize))
 -		value = maximum - slidersize;
  	    if ((w == sbl) || (w == sbr)) {
  		int side = (w == sbl) ? LEFT : RIGHT;
 -		if (newcbs.value > (maximum - slidersize)) {
 -		    newcbs.value = maximum - slidersize;
 -		    XtVaSetValues (w, XmNvalue, newcbs.value - b->sline + b->arr[side].fline, NULL);
 +		if (value > (maximum - slidersize)) {
 +		    value = maximum - slidersize;
 +		    XtVaSetValues (w, XmNvalue, value - b->sline + b->arr[side].fline, NULL);
  		    return;
+ 		}
+ 	    }
 +	    if (value > (maximum - slidersize))
 +		value = maximum - slidersize;
++
  	    newcbs.reason = XmCR_VALUE_CHANGED;
  	    newcbs.event = NULL;
  	    newcbs.value = value;
-@@ -1986,7 +2057,7 @@ static void show_version (Widget parent)
+@@ -1986,7 +2061,7 @@ static void show_version (Widget parent)
  					      mgdiff_width, mgdiff_height,
  					      fg, bg,
  					      DefaultDepth (dpy, DefaultScreen (dpy)));
 -	(void) sprintf (buffer, "mgdiff\n\nA graphical difference browser\n\nAuthor: Dan Williams (dan@sass.com)\nVersion: %s PL%s", VERSION, PATCHLEVEL);
 +	(void) snprintf (buffer, sizeof (buffer), "mgdiff\n\nA graphical difference browser\n\nAuthors: Dan Williams (dan@sass.com)\nErik de Castro Lopo (erikd@mega-nerd.com)\n\nVersion: %s PL%s", VERSION, PATCHLEVEL);
  	XtVaSetValues (dialog,
  		       XmNautoUnmanage, True,
-@@ -2041,12 +2112,12 @@ void process_both_files (char *file1, ch
+@@ -2020,6 +2095,42 @@ static void update_overall (void)
      newss.findex[RIGHT] = value;
+ }
 +/* Re-run diff on the current files and update the display */
 +void reload_both(void)
 +{
 +    DiffInfo *newdi;
++
 +    set_cursor (toplevel);
++
 +    if (no_files_flag == True) {
 +	    /* Currently there are no files,
 +	       so don't do anything */
 +	    return;
 +    }
++
 +    newdi = build_diff_info (diffcmd, diffargs, str_fnamel, str_fnamer);
++
 +    free_diff_info (di);
 +    di = newdi;
 +    if (di->status == 2) {
 +	no_files_flag = True;
 +	toggle_openlr_sensitive (False);
 +	toggle_saveas_sensitive (False, False, False);
 +	free (str_fnamel);
 +	free (str_snamel);
 +	free (str_fnamer);
 +	free (str_snamer);
 +	str_snamel = strdup ("(no file)");
 +	str_snamer = strdup ("(no file)");
 +	str_fnamel = str_fnamer = NULL;
 +    }
 +    refresh ();
 +    fake_adjust_label (fnamel);
 +    reset_cursor (toplevel);
++
 +    handle_diff_errors (di);
 +}
++
  void process_both_files (char *file1, char *name1, char *file2, char *name2)
+ {
      DiffInfo *newdi;
@@ -2041,12 +2152,12 @@ void process_both_files (char *file1, ch
      if (di->status != 2) {
  	no_files_flag = False;
  	toggle_openlr_sensitive (True);
 -	toggle_saveas_sensitive (True);
 +	toggle_saveas_sensitive (True, True, True);
+     }
      else {
  	no_files_flag = True;
  	toggle_openlr_sensitive (False);
 -	toggle_saveas_sensitive (False);
 +	toggle_saveas_sensitive (False, False, False);
  	free (str_fnamel);
  	free (str_snamel);
  	free (str_fnamer);
-@@ -2082,7 +2153,7 @@ void process_left_file (char *file1, cha
+@@ -2082,7 +2193,7 @@ void process_left_file (char *file1, cha
      if (di->status == 2) {
  	no_files_flag = True;
  	toggle_openlr_sensitive (False);
 -	toggle_saveas_sensitive (False);
 +	toggle_saveas_sensitive (False, False, False);
  	free (str_fnamel);
  	free (str_snamel);
  	free (str_fnamer);
-@@ -2117,7 +2188,7 @@ void process_right_file (char *file2, ch
+@@ -2117,7 +2228,7 @@ void process_right_file (char *file2, ch
      if (di->status == 2) {
  	no_files_flag = True;
  	toggle_openlr_sensitive (False);
 -	toggle_saveas_sensitive (False);
 +	toggle_saveas_sensitive (False, False, False);
  	free (str_fnamel);
  	free (str_snamel);
  	free (str_fnamer);
-@@ -2133,6 +2204,7 @@ void process_right_file (char *file2, ch
+@@ -2133,6 +2244,7 @@ void process_right_file (char *file2, ch
      handle_diff_errors (di);
+ }
++
  static void refresh (void)
+ {
      newss.b = di->first;
-@@ -2182,9 +2254,11 @@ void toggle_open_sensitive (Boolean sens
+@@ -2182,9 +2294,11 @@ void toggle_open_sensitive (Boolean sens
      toggle_openlr_sensitive (sensitive);
+ }
 -static void toggle_saveas_sensitive (Boolean sensitive)
 +static void toggle_saveas_sensitive (Boolean saveas, Boolean save_left, Boolean save_right)
+ {
 -    XtSetSensitive (XtNameToWidget (file_menu, "button_3"), sensitive);
-+    XtSetSensitive (XtNameToWidget (file_menu, "button_3"), saveas);
++    XtSetSensitive (XtNameToWidget (file_menu, "button_4"), saveas);
-+    XtSetSensitive (XtNameToWidget (file_menu, "button_4"), save_left);
++    XtSetSensitive (XtNameToWidget (file_menu, "button_5"), save_left);
-+    XtSetSensitive (XtNameToWidget (file_menu, "button_5"), save_right);
++    XtSetSensitive (XtNameToWidget (file_menu, "button_6"), save_right);
+ }
  /*
-@@ -2196,78 +2270,263 @@ static void exit_cb (Widget w, XtPointer
+@@ -2196,78 +2310,263 @@ static void exit_cb (Widget w, XtPointer
      exit ((di != NULL) ? di->status : 2);
+ }
 +static void lost_selection ( Widget  widget, Atom* selection) {
++
 +	if (debug_flag) {
 +		fprintf(stderr,"selection lost on widget %p\n",widget);
 +	}
 +//	newss.lastSelected=NULL;
 +}
++
 +static Boolean do_selection(Widget widget, Atom*  selection, Atom*  target ,
 +                            Atom*  type, XtPointer*  value,
 @@ -829,45 +878,45 @@ Pull patches from Debian.
 +	{
 + 		XtDisownSelection(widget,XA_PRIMARY, CurrentTime);
 +	}
++
 + 	if (newss.lastSelected) {
 + 	   XtOwnSelection(widget,XA_PRIMARY, CurrentTime,&do_selection,&lost_selection,NULL);
 +  	}
++
 +	return;
 +	    }
+ }
  /*
-@@ -2307,14 +2566,14 @@ static void Scroll (Widget widget, XEven
+@@ -2307,14 +2606,14 @@ static void Scroll (Widget widget, XEven
  	else {
  	    char buffer[1024];
 -	    (void) sprintf (buffer, "Illegal argument to action proc Scroll (\"%s\")", params[0]);
 +	    (void) snprintf (buffer, sizeof (buffer), "Illegal argument to action proc Scroll (\"%s\")", params[0]);
  	    XtAppWarning (XtWidgetToApplicationContext (widget), buffer);
+ 	}
+     }
      else {
  	char buffer[1024];
 -	(void) sprintf (buffer, "Illegal number of arguments to action proc Scroll (\"%d\")", *num_params);
 +	(void) snprintf (buffer, sizeof (buffer), "Illegal number of arguments to action proc Scroll (\"%d\")", *num_params);
  	XtAppWarning (XtWidgetToApplicationContext (widget), buffer);
+     }
+ }
-@@ -2391,7 +2650,8 @@ static Dimension get_preferred_width (Wi
+@@ -2391,7 +2690,8 @@ static Dimension get_preferred_width (Wi
  /*
   * delete any prefix ending in '/' and return a copy
   */
 -static char *basename (char *path)
 +#if !(defined __GLIBC__ && __GLIBC__ >= 2)
 +static char *mgdiff_basename (char *path)
+ {
      if (path) {
  	char *p;
-@@ -2416,3 +2676,4 @@ static char *basename (char *path)
+@@ -2416,3 +2716,4 @@ static char *basename (char *path)
      else
  	return (NULL);
+ }
 +#endif

 @@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.2 2023/03/01 23:48:00 vins Exp $
+# $NetBSD: Makefile,v 1.3 2023/03/02 08:15:32 vins Exp $
 DISTNAME=	mgdiff
 PKGNAME=	${DISTNAME}-1.0.1
 PKGREVISION=	1
 CATEGORIES=	devel x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=applications/}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 MAINTAINER=	vins@NetBSD.org
 HOMEPAGE=	https://bsdforge.com/projects/textproc/mgdiff/
 COMMENT=	Graphical front end to Unix diff
 LICENSE=	mit
 USE_IMAKE=	yes
 USE_TOOLS+=	awk:run ksh:run
 REPLACE_KSH=	cvsmgdiff

 @@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.3 2023/03/01 23:48:00 vins Exp $
+$NetBSD: distinfo,v 1.4 2023/03/02 08:15:32 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) = 3be8cae459c84f355de65e37f679649472b38a16
+SHA1 (patch-Mgdiff.ad) = 1a3eade787f06b02c36bdc925a65ee0562f4d9f5
 SHA1 (patch-externs.h) = 8e536067c9834b8ef26a0210aaf8ece31004f310
 SHA1 (patch-files.c) = fa06ab3916e0d0a95551bea5e3320c9e577b3d7a
 SHA1 (patch-legend.c) = 8933bc2938f94bc7c0c11009074517f017d4f8ee
 SHA1 (patch-manual.c) = 2f430240696d6eec22d5dd576c4577e5b7b4578d
-SHA1 (patch-mgdiff.c) = f2e2fb5cc4722ae38e00566ebbc5e87e00457807
+SHA1 (patch-mgdiff.c) = 773c0a4c1a10194fdc44da401c1eb40cae1233fc
 SHA1 (patch-mgdiff.h) = e7958ebd5ca1ccb17c7bcc7cf860d88e81f50cb4
-SHA1 (patch-mgdiff.man) = 6d3a2fbecb7ae1e8f8a2cc4f3c7ac15f44a8e01a
+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

 @@ -1,14 +1,14 @@
-$NetBSD: patch-Mgdiff.ad,v 1.1 2023/03/01 23:48:00 vins Exp $
+$NetBSD: patch-Mgdiff.ad,v 1.2 2023/03/02 08:15:32 vins Exp $
 Pull patches from Debian.
 --- Mgdiff.ad.orig	1994-05-19 02:01:03.000000000 +0000
 +++ Mgdiff.ad
 @@ -2,6 +2,8 @@
  ! Mgdiff.ad,v 2.0 1994/05/19 02:01:03 dan Exp
+ !
 +*XmScrollBar*width:       15
++
+ !
  ! 				widget hierarchy:
 @@ -27,32 +27,46 @@ Pull patches from Debian.
  ! the overview area
+ !
 -*sbl.width:				16
 -*sbr.width:				16
 -*dam.width:				16
 +*sbl.width:				15
 +*sbl.Background:			lightgreen
 +*sbr.width:				15
 +*sbr.Background:			lightgreen
 +*dam.width:				30
  *dam.Foreground:			black
  *dam.Background:			cyan
-@@ -215,10 +219,14 @@
+@@ -210,15 +214,23 @@
- *file_menu*button_3.Accelerator:	Ctrl<Key>s
+ *file_menu*button_2.Accelerator:	Ctrl<Key>r
- *file_menu*button_3.AcceleratorText:	Ctrl+S
+ *file_menu*button_2.AcceleratorText:	Ctrl+R
 -*file_menu*button_3.XmString:		Save As...
 -*file_menu*button_3.Mnemonic:		S
 -*file_menu*button_3.Accelerator:	Ctrl<Key>s
 -*file_menu*button_3.AcceleratorText:	Ctrl+S
+-
 -*file_menu*button_4.XmString:		Exit
 -*file_menu*button_4.Mnemonic:		E
 -*file_menu*button_4.Accelerator:	Ctrl<Key>c
 -*file_menu*button_4.AcceleratorText:	Ctrl+C
-+*file_menu*button_4.XmString:		Save As Left...
++*file_menu*button_3.XmString:		Reload Both
-+*file_menu*button_5.XmString:		Save As Right...
++*file_menu*button_3.Accelerator:	Meta<Key>r
 +*file_menu*button_3.AcceleratorText:	Meta+R
++
-+*file_menu*button_6.XmString:		Exit
++*file_menu*button_4.XmString:		Save As...
-+*file_menu*button_6.Mnemonic:		E
++*file_menu*button_4.Mnemonic:		S
-+*file_menu*button_6.Accelerator:	Ctrl<Key>c
++*file_menu*button_4.Accelerator:	Ctrl<Key>s
-+*file_menu*button_6.AcceleratorText:	Ctrl+C
++*file_menu*button_4.AcceleratorText:	Ctrl+S
++
 +*file_menu*button_5.XmString:		Save As Left...
 +*file_menu*button_6.XmString:		Save As Right...
++
 +*file_menu*button_7.XmString:		Exit
 +*file_menu*button_7.Mnemonic:		E
 +*file_menu*button_7.Accelerator:	Ctrl<Key>c
 +*file_menu*button_7.AcceleratorText:	Ctrl+C
++
+ !
+ !
  *view_menu*button_0.XmString:		Previous