Attachment #231449 for bug #319707

Lines 126-133 KEYSERV = @KEYSERV@ Link Here

(-)src/Makefile.in.dist (-1 / +1 lines)
126	LDFLAGS = @LDFLAGS@	126	LDFLAGS = @LDFLAGS@
127	LIBICONV = @LIBICONV@	127	LIBICONV = @LIBICONV@
128	LIBINTL = @LIBINTL@	128	LIBINTL = @LIBINTL@
129	LIBOBJS = @LIBOBJS@
130	LIBPORT_GETOPT_LONG_DEP = @LIBPORT_GETOPT_LONG_DEP@	129	LIBPORT_GETOPT_LONG_DEP = @LIBPORT_GETOPT_LONG_DEP@
		130	LIBOBJS = @LIBOBJS@ @LIBPORT_GETOPT_LONG_DEP@
131	LIBS = @LIBS@	131	LIBS = @LIBS@
132	LTLIBICONV = @LTLIBICONV@	132	LTLIBICONV = @LTLIBICONV@
133	LTLIBINTL = @LTLIBINTL@	133	LTLIBINTL = @LTLIBINTL@

Lines 155-162 void mc_wlocate(WIN *win, int x, int y); Link Here

(-)./src/window.h.dist (+4 lines)
155	void mc_wputc(WIN *win, wchar_t c);	155	void mc_wputc(WIN *win, wchar_t c);
156	void mc_wdrawelm(WIN win, int y, ELM e);	156	void mc_wdrawelm(WIN win, int y, ELM e);
157	void mc_wputs(WIN win, const char s);	157	void mc_wputs(WIN win, const char s);
		158	#ifdef __GNU__
158	int mc_wprintf(WIN , const char , ...)	159	int mc_wprintf(WIN , const char , ...)
159	__attribute__((format(printf, 2, 3)));	160	__attribute__((format(printf, 2, 3)));
		161	#else
		162	int mc_wprintf(WIN , const char , ...);
		163	#endif
160	void mc_wbell(void);	164	void mc_wbell(void);
161	void mc_wcursor(WIN *win, int type);	165	void mc_wcursor(WIN *win, int type);
162	void mc_wtitle(WIN w, int pos , const char s);	166	void mc_wtitle(WIN w, int pos , const char s);

Lines 215-221 int main(int argc, char **argv); Link Here

(-)./src/minicom.h.dist (+4 lines)
215		215
216	/* Prototypes from file: main.c */	216	/* Prototypes from file: main.c */
217	extern time_t old_online;	217	extern time_t old_online;
		218	#ifdef __GNUC__
218	void leave(const char *s) __attribute__((noreturn));	219	void leave(const char *s) __attribute__((noreturn));
		220	#else
		221	void leave(const char *s);
		222	#endif
219	char *esc_key(void);	223	char *esc_key(void);
220	void term_socket_connect(void);	224	void term_socket_connect(void);
221	void term_socket_close(void);	225	void term_socket_close(void);

Lines 36-41 Link Here

(-)./src/dial.c.dist (-5 / +26 lines)
36	#include "rcsid.h"	36	#include "rcsid.h"
37	RCSID("$Id: dial.c,v 1.26 2007-10-10 20:18:20 al-guest Exp $")	37	RCSID("$Id: dial.c,v 1.26 2007-10-10 20:18:20 al-guest Exp $")
38		38
		39	#ifndef alloca
		40	#include <alloca.h>
		41	#endif
		42
		43	#ifndef MB_LEN_MAX
		44	#include <limits.h>
		45	#endif
		46
39	#include "port.h"	47	#include "port.h"
40	#include "minicom.h"	48	#include "minicom.h"
41	#include "intl.h"	49	#include "intl.h"
Lines 51-56 RCSID("$Id: dial.c,v 1.26 2007-10-10 20: Link Here
51	# endif	59	# endif
52	#endif	60	#endif
53		61
		62	#ifndef __attribute__
		63	/* This feature is available in gcc versions 2.5 and later. */
		64	# if __GNUC__ < 2 \|\| (__GNUC__ == 2 && __GNUC_MINOR__ < 5) \|\| __STRICT_ANSI__
		65	# define __attribute__(Spec) /* empty */
		66	# endif
		67	/* The __-protected variants of `format' and `printf' attributes
		68	* are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */
		69	# if __GNUC__ < 2 \|\| (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
		70	# define __format__ format
		71	# define __printf__ printf
		72	# endif
		73	#endif
		74
54	/* Dialing directory. */	75	/* Dialing directory. */
55	struct v1_dialent {	76	struct v1_dialent {
56	char name[32];	77	char name[32];
Lines 1547-1562 void dialdir(void) Link Here
1547	mc_wputs(w,	1568	mc_wputs(w,
1548	_(" Name Number Last on Times Script\n"));	1569	_(" Name Number Last on Times Script\n"));
1549	for (i = 0; i < DIALOPTS; i++) {	1570	for (i = 0; i < DIALOPTS; i++) {
1550	const char str, c;	1571	const char str, cc;
1551	size_t j;	1572	size_t j;
1552		1573
1553	str = _(what[i]);	1574	str = _(what[i]);
1554	c = str;	1575	cc = str;
1555	for (j = 0; j < DIAL_WIDTH - 1 && *c != 0; j++) {	1576	for (j = 0; j < DIAL_WIDTH - 1 && *cc != 0; j++) {
1556	wchar_t wc;	1577	wchar_t wc;
1557	c += one_mbtowc(&wc, c, MB_LEN_MAX);	1578	cc += one_mbtowc(&wc, cc, MB_LEN_MAX);
1558	}	1579	}
1559	what_lens[i] = c - str;	1580	what_lens[i] = cc - str;
1560	j = DIAL_WIDTH - j; /* Characters left for padding */	1581	j = DIAL_WIDTH - j; /* Characters left for padding */
1561	what_padding[i][1] = j / 2; /* Rounding down */	1582	what_padding[i][1] = j / 2; /* Rounding down */
1562	what_padding[i][0] = j - what_padding[i][1]; /* >= 1 */	1583	what_padding[i][0] = j - what_padding[i][1]; /* >= 1 */

Lines 34-39 RCSID(PKG_VER "$Id: minicom.c,v 1.34 200 Link Here

(-)./src/minicom.c.dist (+4 lines)
34	#include <wchar.h>	34	#include <wchar.h>
35	#include <wctype.h>	35	#include <wctype.h>
36		36
		37	#ifndef MB_LEN_MAX
		38	#include <limits.h>
		39	#endif
		40
37	#define EXTERN	41	#define EXTERN
38	#include "port.h"	42	#include "port.h"
39	#include "minicom.h"	43	#include "minicom.h"

Lines 37-42 Link Here

(-)./src/config.c.dist (+4 lines)
37	#include "rcsid.h"	37	#include "rcsid.h"
38	RCSID("$Id: config.c,v 1.31 2008-02-24 10:33:49 al-guest Exp $")	38	RCSID("$Id: config.c,v 1.31 2008-02-24 10:33:49 al-guest Exp $")
39		39
		40	#ifndef MB_LEN_MAX
		41	#include <limits.h>
		42	#endif
		43
40	#include "port.h"	44	#include "port.h"
41	#include "minicom.h"	45	#include "minicom.h"
42	#include "intl.h"	46	#include "intl.h"




#include "rcsid.h"
RCSID("$Id: file.c,v 1.13 2007-10-10 20:18:20 al-guest Exp $")

#ifndef MB_LEN_MAX
#include <limits.h>
#endif

#include "port.h"
#include "minicom.h"
#include "intl.h"

  }
  new_dp_len = mbslen (work_dir);
  if (new_dp_len + (fmt_len = mbslen(cwd_str_fmt)) > 75) {
    size_t ii;
    char *tmp_dir = work_dir;

    /* We want the last 73 characters */
    for (ii = 0; 73 + ii < new_dp_len + fmt_len; ii++) {
      wchar_t wc;

      tmp_dir += one_mbtowc(&wc, work_dir, MB_LEN_MAX);

Lines 31-36 Link Here

(-)./src/common.c.dist (+4 lines)
31	#include "rcsid.h"	31	#include "rcsid.h"
32	RCSID("$Id: common.c,v 1.8 2007-10-10 20:18:20 al-guest Exp $")	32	RCSID("$Id: common.c,v 1.8 2007-10-10 20:18:20 al-guest Exp $")
33		33
		34	#ifndef MB_LEN_MAX
		35	#include <limits.h>
		36	#endif
		37
34	#include "port.h"	38	#include "port.h"
35	#include "minicom.h"	39	#include "minicom.h"
36	#include <stdarg.h>	40	#include <stdarg.h>

Lines 79-84 Link Here

(-)./lib/getopt.c.dist (+8 lines)
79	#endif	79	#endif
80	#endif	80	#endif
81		81
		82	#ifdef __sgi
		83	#include <string.h>
		84	#endif
		85
82	#if defined (WIN32) && !defined (__CYGWIN32__)	86	#if defined (WIN32) && !defined (__CYGWIN32__)
83	/* It's not Unix, really. See? Capital letters. */	87	/* It's not Unix, really. See? Capital letters. */
84	#include <windows.h>	88	#include <windows.h>
Lines 262-268 static char const original_argv; Link Here
262	/* Make sure the environment variable bash 2.0 puts in the environment	266	/* Make sure the environment variable bash 2.0 puts in the environment
263	is valid for the getopt call we must make sure that the ARGV passed	267	is valid for the getopt call we must make sure that the ARGV passed
264	to getopt is that one passed to the process. */	268	to getopt is that one passed to the process. */
		269	#ifdef __GNUC__
265	static void store_args (int argc, char const argv) __attribute__ ((unused));	270	static void store_args (int argc, char const argv) __attribute__ ((unused));
		271	#else
		272	static void store_args (int argc, char const argv);
		273	#endif
266	static void	274	static void
267	store_args (int argc, char const argv)	275	store_args (int argc, char const argv)
268	{	276	{

Lines 9022-9028 fi Link Here

(-)configure.dist (-1 / +3 lines)
9022		9022
9023	if test "x$ac_cv_func_getopt_long" = xno	9023	if test "x$ac_cv_func_getopt_long" = xno
9024	then	9024	then
9025	LIBPORT_GETOPT_LONG_DEP="getopt.o"	9025	{ { echo "$as_me:$LINENO: notice: Adding getopt.o dependency" >&5
		9026	echo "$as_me: notice: Adding getopt.o dependency" >&2;}
		9027	LIBPORT_GETOPT_LONG_DEP="\${LIBOBJDIR}getopt\$U.$ac_objext"; }
9026	fi	9028	fi
9027		9029
9028		9030

Return to bug 319707

Lines 27-32 Link Here

(-)./src/file.c.dist (-2 / +6 lines)
27	#include "rcsid.h"	27	#include "rcsid.h"
28	RCSID("$Id: file.c,v 1.13 2007-10-10 20:18:20 al-guest Exp $")	28	RCSID("$Id: file.c,v 1.13 2007-10-10 20:18:20 al-guest Exp $")
29		29
		30	#ifndef MB_LEN_MAX
		31	#include <limits.h>
		32	#endif
		33
30	#include "port.h"	34	#include "port.h"
31	#include "minicom.h"	35	#include "minicom.h"
32	#include "intl.h"	36	#include "intl.h"
Lines 370-380 static int new_filedir(GETSDIR_ENTRY *o_ Link Here
370	}	374	}
371	new_dp_len = mbslen (work_dir);	375	new_dp_len = mbslen (work_dir);
372	if (new_dp_len + (fmt_len = mbslen(cwd_str_fmt)) > 75) {	376	if (new_dp_len + (fmt_len = mbslen(cwd_str_fmt)) > 75) {
373	size_t i;	377	size_t ii;
374	char *tmp_dir = work_dir;	378	char *tmp_dir = work_dir;
375		379
376	/* We want the last 73 characters */	380	/* We want the last 73 characters */
377	for (i = 0; 73 + i < new_dp_len + fmt_len; i++) {	381	for (ii = 0; 73 + ii < new_dp_len + fmt_len; ii++) {
378	wchar_t wc;	382	wchar_t wc;
379		383
380	tmp_dir += one_mbtowc(&wc, work_dir, MB_LEN_MAX);	384	tmp_dir += one_mbtowc(&wc, work_dir, MB_LEN_MAX);