head	1.4;
access;
symbols
	RELEASE_9_0_0:1.3
	RELEASE_7_4_0:1.3
	RELEASE_8_2_0:1.3
	RELEASE_6_EOL:1.3
	RELEASE_8_1_0:1.3
	RELEASE_7_3_0:1.3
	RELEASE_8_0_0:1.3
	RELEASE_7_2_0:1.3
	RELEASE_7_1_0:1.3
	RELEASE_6_4_0:1.3
	RELEASE_5_EOL:1.3
	RELEASE_7_0_0:1.3
	RELEASE_6_3_0:1.3
	PRE_XORG_7:1.3
	RELEASE_4_EOL:1.3
	RELEASE_6_2_0:1.3
	RELEASE_6_1_0:1.3
	RELEASE_5_5_0:1.3
	RELEASE_6_0_0:1.3
	RELEASE_5_4_0:1.3
	RELEASE_4_11_0:1.3
	RELEASE_5_3_0:1.3
	RELEASE_4_10_0:1.3
	RELEASE_5_2_1:1.3
	RELEASE_5_2_0:1.3
	RELEASE_4_9_0:1.3
	RELEASE_5_1_0:1.3
	RELEASE_4_8_0:1.3
	RELEASE_5_0_0:1.3
	RELEASE_4_7_0:1.3
	RELEASE_4_6_2:1.3
	RELEASE_4_6_1:1.3
	RELEASE_4_6_0:1.3
	RELEASE_5_0_DP1:1.3
	RELEASE_4_5_0:1.3
	RELEASE_4_4_0:1.3
	RELEASE_4_3_0:1.3
	RELEASE_4_2_0:1.3
	RELEASE_4_1_1:1.3
	RELEASE_4_1_0:1.3
	RELEASE_3_5_0:1.3
	RELEASE_4_0_0:1.3
	RELEASE_3_4_0:1.3
	RELEASE_3_3_0:1.3
	RELEASE_3_2_0:1.3
	RELEASE_3_1_0:1.3
	RELEASE_2_2_8:1.3
	RELEASE_3_0_0:1.3
	RELEASE_2_2_7:1.3
	RELEASE_2_2_6:1.3
	RELEASE_2_2_5:1.3
	RELEASE_2_2_1:1.3
	RELEASE_2_2_2:1.3;
locks; strict;
comment	@# @;


1.4
date	2011.12.22.01.01.30;	author vanilla;	state dead;
branches;
next	1.3;

1.3
date	97.01.09.12.41.39;	author ache;	state Exp;
branches;
next	1.2;

1.2
date	96.11.10.03.10.41;	author peter;	state dead;
branches;
next	1.1;

1.1
date	96.08.18.15.12.39;	author peter;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Fix clang compile issue.
@
text
@*** Complete.c.bak	Fri Oct 18 09:10:31 1996
--- Complete.c	Thu Jan  9 15:17:48 1997
***************
*** 241,247 ****
--- 241,251 ----
  static int
  CompareStrings(char **a, char **b)
  {
+ #ifdef __FreeBSD__
+ 	return strcoll(*a, *b);
+ #else
  	return strcmp(*a, *b);
+ #endif
  }
  
  static void
*** Main.c.bak	Fri Oct 18 09:01:58 1996
--- Main.c	Thu Jan  9 15:24:22 1997
***************
*** 22,27 ****
--- 22,30 ----
  #include <pwd.h>
  #include <errno.h>
  #include <ctype.h>
+ #ifdef __FreeBSD__
+ #include <locale.h>
+ #endif
  #include <signal.h>
  #include <setjmp.h>
  #include <stdlib.h>
***************
*** 866,871 ****
--- 869,877 ----
  	int opt, result;
  	OpenOptions openopt;
  
+ #ifdef __FreeBSD__
+ 	setlocale(LC_ALL, "");
+ #endif
  	Init();
  	RunStartupScript();
  
@


1.3
log
@Localize it
@
text
@@


1.2
log
@Update ncftp2.4.1 -> 2.4.2

Removed my patch for the extra characters in the passwd prompt caused by
the long-standing (but now fixed in development sources) ncurses problem
now that the author has an equivalent fix.
@
text
@d1 42
a42 28
#
# This is to work around an apparent ncurses bug.. It's a slight optimisation
# too, I think.
#
--- Win.c.dist	Wed Dec  6 13:38:47 1995
+++ Win.c	Sun Aug 18 23:08:11 1996
@@@@ -1101,16 +1101,12 @@@@
 			Exit(kExitWinFail2);
 	}
 
+	werase(gPromptWin);
 	WAttr(gPromptWin, flags, 1);
-	if (addTail) {
-		mvwprintw(gPromptWin, 0,0, "%s%s", pr, kPromptTail);
-		WAttr(gPromptWin, flags, 0);
-	} else {
-		mvwprintw(gPromptWin, 0,0, "%s", pr);
-		WAttr(gPromptWin, flags, 0);
-		if (flags & kReverse)
-			wprintw(gPromptWin, " ");
-	}
+	mvwprintw(gPromptWin, 0,0, "%s", pr);
+	if (addTail)
+		wprintw(gPromptWin, "%s", kPromptTail);
+	WAttr(gPromptWin, flags, 0);
 	wnoutrefresh(gPromptWin);
 	werase(gInputWin);
 	touchwin(gInputWin);
@


1.1
log
@Work around what appears to be a ncurses bug.  The command line at the
bottom of the screen can sometimes have stray characters left behind from
the previous command.  This seems to be because ncurses is ignoreing
a ``wprintw(window, "%s", " ")'' when it's in the last column of a window.
I dont know who is right, ncurses or ncftp.

This workaround also makes the code a little cleaner as a side effect. :-)
@
text
@@
