24 files changed, 39 insertions, 84 deletions
diff --git a/alpine/osdep/Makefile.in b/alpine/osdep/Makefile.in
index c835058c..e1f0808c 100644
--- a/alpine/osdep/Makefile.in
+++ b/alpine/osdep/Makefile.in
@@ -107,6 +107,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
 	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/m4_ax_prog_cc_for_build.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
 	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -209,12 +210,18 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
 CP = @CP@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
 CYGPATH_W = @CYGPATH_W@
 C_CLIENT_AUTHS = @C_CLIENT_AUTHS@
 C_CLIENT_BUNDLED = @C_CLIENT_BUNDLED@
@@ -248,6 +255,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 ISPELLPROG = @ISPELLPROG@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
@@ -314,6 +322,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 acx_pthread_config = @acx_pthread_config@
 alpine_interactive_spellcheck = @alpine_interactive_spellcheck@
diff --git a/alpine/osdep/alpine-splash.bmp b/alpine/osdep/alpine-splash.bmp
index c1b5225d..b22fba28 100644
--- a/alpine/osdep/alpine-splash.bmp
+++ b/alpine/osdep/alpine-splash.bmp
diff --git a/alpine/osdep/chnge_pw.c b/alpine/osdep/chnge_pw.c
index 1a83f827..b4612aee 100644
--- a/alpine/osdep/chnge_pw.c
+++ b/alpine/osdep/chnge_pw.c
@@ -1,11 +1,7 @@
-#if !defined(lint) && !defined(DOS)
-static char rcsid[] = "$Id: chnge_pw.c 769 2007-10-24 00:15:40Z hubert@u.washington.edu $";
-#endif
-
 /*
  * ========================================================================
  * Copyright 2006-2007 University of Washington
- * Copyright 2013-2021 Eduardo Chappa
+ * Copyright 2013-2022 Eduardo Chappa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/alpine/osdep/chnge_pw.h b/alpine/osdep/chnge_pw.h
index cd53c3a5..b415d9e6 100644
--- a/alpine/osdep/chnge_pw.h
+++ b/alpine/osdep/chnge_pw.h
@@ -3,7 +3,7 @@
  *
  * ========================================================================
  * Copyright 2006-2007 University of Washington
- * Copyright 2013-2021 Eduardo Chappa
+ * Copyright 2013-2022 Eduardo Chappa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/alpine/osdep/debuging.c b/alpine/osdep/debuging.c
index 015d38d2..8887a2af 100644
--- a/alpine/osdep/debuging.c
+++ b/alpine/osdep/debuging.c
@@ -1,11 +1,7 @@
-#if !defined(lint) && !defined(DOS)
-static char rcsid[] = "$Id: debuging.c 900 2008-01-05 01:13:26Z hubert@u.washington.edu $";
-#endif
-
 /*
  * ========================================================================
  * Copyright 2006-2008 University of Washington
- * Copyright 2013-2021 Eduardo Chappa
+ * Copyright 2013-2022 Eduardo Chappa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -186,7 +182,7 @@ init_debug(void)
 void
 save_debug_on_crash(FILE *dfile, int (*keystrokes) (int *, char *, size_t))
 {
-    char nbuf[5], crashfile[MAXPATH+1], filename[MAXPATH+1];
+    char nbuf[11], crashfile[MAXPATH+1], filename[MAXPATH+1];
     int i;
     struct stat dbuf, tbuf;
     time_t now = time((time_t *)0);
diff --git a/alpine/osdep/diskquot.non.c b/alpine/osdep/diskquot.non.c
index 17465f63..2eb64638 100644
--- a/alpine/osdep/diskquot.non.c
+++ b/alpine/osdep/diskquot.non.c
@@ -1,7 +1,3 @@
-#if !defined(lint) && !defined(DOS)
-static char rcsid[] = "$Id: diskquot.non.c 761 2007-10-23 22:35:18Z hubert@u.washington.edu $";
-#endif
-
 /*
  * ========================================================================
  * Copyright 2006 University of Washington
diff --git a/alpine/osdep/execview.c b/alpine/osdep/execview.c
index 44d97266..78ba1662 100644
--- a/alpine/osdep/execview.c
+++ b/alpine/osdep/execview.c
@@ -1,11 +1,7 @@
-#if !defined(lint) && !defined(DOS)
-static char rcsid[] = "$Id: execview.c 942 2008-03-04 18:21:33Z hubert@u.washington.edu $";
-#endif
-
 /*
  * ========================================================================
  * Copyright 2006-2008 University of Washington
- * Copyright 2013-2021 Eduardo Chappa
+ * Copyright 2013-2022 Eduardo Chappa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/alpine/osdep/fltrname.c b/alpine/osdep/fltrname.c
index cd17266e..5aa57efa 100644
--- a/alpine/osdep/fltrname.c
+++ b/alpine/osdep/fltrname.c
@@ -1,11 +1,7 @@
-#if !defined(lint) && !defined(DOS)
-static char rcsid[] = "$Id: fltrname.c 769 2007-10-24 00:15:40Z hubert@u.washington.edu $";
-#endif
-
 /*
  * ========================================================================
  * Copyright 2006-2007 University of Washington
- * Copyright 2013-2021 Eduardo Chappa
+ * Copyright 2013-2022 Eduardo Chappa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -92,7 +88,7 @@ filter_filename(char *file, int *fatal, int strict)
             ill_file[MIN(ptr-file,sizeof(ill_file)-1)] = '\0';
 	    snprintf(error, sizeof(error),
 		    "Character \"%s\" after \"%.*s\" not allowed in file name",
-		    ill_char, ERRORLEN-50, ill_file);
+		    ill_char, ERRORLEN-57, ill_file);
         } else {
             snprintf(error, sizeof(error),
                     "First character, \"%s\", not allowed in file name",
diff --git a/alpine/osdep/jobcntrl.c b/alpine/osdep/jobcntrl.c
index e3d790df..d35a9ef9 100644
--- a/alpine/osdep/jobcntrl.c
+++ b/alpine/osdep/jobcntrl.c
@@ -1,7 +1,3 @@
-#if !defined(lint) && !defined(DOS)
-static char rcsid[] = "$Id: jobcntrl.c 765 2007-10-23 23:51:37Z hubert@u.washington.edu $";
-#endif
-
 /*
  * ========================================================================
  * Copyright 2006 University of Washington
diff --git a/alpine/osdep/mswin.rc b/alpine/osdep/mswin.rc
index bef4729f..a9a95dbf 100644
--- a/alpine/osdep/mswin.rc
+++ b/alpine/osdep/mswin.rc
@@ -244,8 +244,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,24,1,0
- PRODUCTVERSION 2,24,1,0
+ FILEVERSION 2,26,0,0
+ PRODUCTVERSION 2,26,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -267,12 +267,12 @@ BEGIN
 #else
             VALUE "FileDescription", "Alpine\0"
 #endif
-            VALUE "FileVersion", "2.24.1\0"
+            VALUE "FileVersion", "2.26\0"
             VALUE "InternalName", "alpine\0"
             VALUE "LegalCopyright", "Copyright 2013-2021 Eduardo Chappa, Copyright 2006-2009 University of Washington\0"
             VALUE "OriginalFilename", "alpine.exe\0"
             VALUE "ProductName", "alpine\0"
-            VALUE "ProductVersion", "2.24.1\0"
+            VALUE "ProductVersion", "2.26\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/alpine/osdep/mswinver.c b/alpine/osdep/mswinver.c
index 402b7013..ef49a09a 100644
--- a/alpine/osdep/mswinver.c
+++ b/alpine/osdep/mswinver.c
@@ -1,7 +1,7 @@
 /*
  * ========================================================================
  * Copyright 2006-2009 University of Washington
- * Copyright 2013-2021 Eduardo Chappa
+ * Copyright 2013-2022 Eduardo Chappa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  */
 
 #define VER_MAJOR 2
-#define VER_MINOR 24
+#define VER_MINOR 26
 
 extern char datestamp[];
 
diff --git a/alpine/osdep/print.c b/alpine/osdep/print.c
index 1db00f34..943cd85e 100644
--- a/alpine/osdep/print.c
+++ b/alpine/osdep/print.c
@@ -1,11 +1,7 @@
-#if !defined(lint) && !defined(DOS)
-static char rcsid[] = "$Id: print.c 942 2008-03-04 18:21:33Z hubert@u.washington.edu $";
-#endif
-
 /*
  * ========================================================================
  * Copyright 2006-2008 University of Washington
- * Copyright 2013-2021 Eduardo Chappa
+ * Copyright 2013-2022 Eduardo Chappa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -101,7 +97,7 @@ open_printer(char *desc)
     char *p, *init, *nick;
     char aname[100], wname[100];
     char *printer;
-    int	 done = 0, i, lastprinter, cur_printer = 0;
+    int	 done = 0, i, lastprinter = 0, cur_printer = 0;
     HelpType help;
     char   **list;
     static ESCKEY_S ekey[] = {
diff --git a/alpine/osdep/termin.gen.c b/alpine/osdep/termin.gen.c
index b8d01b15..0179e524 100644
--- a/alpine/osdep/termin.gen.c
+++ b/alpine/osdep/termin.gen.c
@@ -1,11 +1,7 @@
-#if !defined(lint) && !defined(DOS)
-static char rcsid[] = "$Id: termin.gen.c 1025 2008-04-08 22:59:38Z hubert@u.washington.edu $";
-#endif
-
 /*
  * ========================================================================
  * Copyright 2006-2008 University of Washington
- * Copyright 2013-2021 Eduardo Chappa
+ * Copyright 2013-2022 Eduardo Chappa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1026,14 +1022,13 @@ optionally_enter(char *utf8string, int y_base, int x_base, int utf8string_size,
     /*
      * Change string back into UTF-8.
      */
-    candidate = ucs4_to_utf8_cpystr(string);
+    candidate = ucs4_to_utf8_n_cpystr(string, utf8string_size);
 
     if(string) 
       fs_give((void **) &string);
 
     if(candidate){
-	strncpy(utf8string, candidate, utf8string_size);
-	utf8string[utf8string_size-1] = '\0';
+	strcpy(utf8string, candidate);
 	fs_give((void **) &candidate);
     }
 
diff --git a/alpine/osdep/termin.gen.h b/alpine/osdep/termin.gen.h
index f97f9c7a..6a1d293f 100644
--- a/alpine/osdep/termin.gen.h
+++ b/alpine/osdep/termin.gen.h
@@ -3,7 +3,7 @@
  *
  * ========================================================================
  * Copyright 2006-2007 University of Washington
- * Copyright 2013-2021 Eduardo Chappa
+ * Copyright 2013-2022 Eduardo Chappa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/alpine/osdep/termin.unx.c b/alpine/osdep/termin.unx.c
index 589d7940..a58283e5 100644
--- a/alpine/osdep/termin.unx.c
+++ b/alpine/osdep/termin.unx.c
@@ -1,11 +1,7 @@
-#if !defined(lint) && !defined(DOS)
-static char rcsid[] = "$Id: termin.unx.c 1025 2008-04-08 22:59:38Z hubert@u.washington.edu $";
-#endif
-
 /*
  * ========================================================================
  * Copyright 2006-2008 University of Washington
- * Copyright 2013-2021 Eduardo Chappa
+ * Copyright 2013-2022 Eduardo Chappa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/alpine/osdep/termin.unx.h b/alpine/osdep/termin.unx.h
index f9886ecb..f8bad485 100644
--- a/alpine/osdep/termin.unx.h
+++ b/alpine/osdep/termin.unx.h
@@ -3,7 +3,7 @@
  *
  * ========================================================================
  * Copyright 2006-2007 University of Washington
- * Copyright 2013-2021 Eduardo Chappa
+ * Copyright 2013-2022 Eduardo Chappa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/alpine/osdep/termin.wnt.c b/alpine/osdep/termin.wnt.c
index 107a9594..9db85406 100644
--- a/alpine/osdep/termin.wnt.c
+++ b/alpine/osdep/termin.wnt.c
@@ -1,11 +1,7 @@
-#if !defined(lint) && !defined(DOS)
-static char rcsid[] = "$Id: termin.unx.c 193 2006-10-20 17:09:26Z mikes@u.washington.edu $";
-#endif
-
 /*
  * ========================================================================
  * Copyright 2006-2008 University of Washington
- * Copyright 2013-2021 Eduardo Chappa
+ * Copyright 2013-2022 Eduardo Chappa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/alpine/osdep/termin.wnt.h b/alpine/osdep/termin.wnt.h
index 375f59ce..0bc93724 100644
--- a/alpine/osdep/termin.wnt.h
+++ b/alpine/osdep/termin.wnt.h
@@ -3,7 +3,7 @@
  *
  * ========================================================================
  * Copyright 2006-2007 University of Washington
- * Copyright 2013-2021 Eduardo Chappa
+ * Copyright 2013-2022 Eduardo Chappa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/alpine/osdep/termout.gen.c b/alpine/osdep/termout.gen.c
index 62f3deb4..f1687def 100644
--- a/alpine/osdep/termout.gen.c
+++ b/alpine/osdep/termout.gen.c
@@ -1,11 +1,7 @@
-#if !defined(lint) && !defined(DOS)
-static char rcsid[] = "$Id: termout.gen.c 1012 2008-03-26 00:44:22Z hubert@u.washington.edu $";
-#endif
-
 /*
  * ========================================================================
  * Copyright 2006-2008 University of Washington
- * Copyright 2013-2021 Eduardo Chappa
+ * Copyright 2013-2022 Eduardo Chappa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/alpine/osdep/termout.gen.h b/alpine/osdep/termout.gen.h
index 331e3bfc..009ef709 100644
--- a/alpine/osdep/termout.gen.h
+++ b/alpine/osdep/termout.gen.h
@@ -3,7 +3,7 @@
  *
  * ========================================================================
  * Copyright 2006-2007 University of Washington
- * Copyright 2013-2021 Eduardo Chappa
+ * Copyright 2013-2022 Eduardo Chappa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/alpine/osdep/termout.unx.c b/alpine/osdep/termout.unx.c
index d906511e..4e7b951f 100644
--- a/alpine/osdep/termout.unx.c
+++ b/alpine/osdep/termout.unx.c
@@ -1,11 +1,7 @@
-#if !defined(lint) && !defined(DOS)
-static char rcsid[] = "$Id: termout.unx.c 955 2008-03-06 23:52:36Z hubert@u.washington.edu $";
-#endif
-
 /*
  * ========================================================================
  * Copyright 2006-2008 University of Washington
- * Copyright 2013-2021 Eduardo Chappa
+ * Copyright 2013-2022 Eduardo Chappa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/alpine/osdep/termout.unx.h b/alpine/osdep/termout.unx.h
index 21081cd7..96e6d1e6 100644
--- a/alpine/osdep/termout.unx.h
+++ b/alpine/osdep/termout.unx.h
@@ -3,7 +3,7 @@
  *
  * ========================================================================
  * Copyright 2006-2007 University of Washington
- * Copyright 2013-2021 Eduardo Chappa
+ * Copyright 2013-2022 Eduardo Chappa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/alpine/osdep/termout.wnt.c b/alpine/osdep/termout.wnt.c
index 087ea5ae..8d608d7c 100644
--- a/alpine/osdep/termout.wnt.c
+++ b/alpine/osdep/termout.wnt.c
@@ -1,11 +1,7 @@
-#if !defined(lint) && !defined(DOS)
-static char rcsid[] = "$Id: termout.unx.c 159 2006-10-02 22:00:13Z hubert@u.washington.edu $";
-#endif
-
 /*
  * ========================================================================
  * Copyright 2006-2007 University of Washington
- * Copyright 2013-2021 Eduardo Chappa
+ * Copyright 2013-2022 Eduardo Chappa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -786,8 +782,7 @@ os_login_dialog (NETMBX *mb, char *user_utf8, int userlen,
 
 	tpwd_utf8 = lptstr_to_utf8(dlgpw.pwd);
 	if(tpwd_utf8){
-	    strncpy(*pwd_utf8, tpwd_utf8, pwdlen - 1);
-	    (*pwd_utf8)[pwdlen - 1] = '\0';
+	    *pwd_utf8 = cpystr(tpwd_utf8);
 	    fs_give((void **) &tpwd_utf8);
 	}
 	if(prespass)
diff --git a/alpine/osdep/termout.wnt.h b/alpine/osdep/termout.wnt.h
index 7541cc6d..954bbc1d 100644
--- a/alpine/osdep/termout.wnt.h
+++ b/alpine/osdep/termout.wnt.h
@@ -3,7 +3,7 @@
  *
  * ========================================================================
  * Copyright 2006-2007 University of Washington
- * Copyright 2013-2021 Eduardo Chappa
+ * Copyright 2013-2022 Eduardo Chappa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.