osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Chris Heath: fix up the check for printable ASCII done on Windows 

not to include DEL as printable ASCII.

Also change the check in strutil.c to do it by redefining "isprint()",
as is done in "gtk/gtkglobals.h", rather than by #ifdeffing the point at
which the test is done.

svn path=/trunk/; revision=8118
This commit is contained in:
Guy Harris 2003-08-01 01:39:01 +00:00
parent 14ffcc74bf
commit 90bf936ffa
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -1780,6 +1780,7 @@ And assorted fixes and enhancements by the people listed above and by:
<smhuang [AT] pcs.csie.nctu.edu.tw>
Michael Kopp <michael.kopp [AT] isarnet.de>
Bernd Leibing <bernd.leibing [AT] kiz.uni-ulm.de>
Chris Heath <chris [AT] heathens.co.nz>
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
give his permission to use his version of snprintf.c.

1
doc/ethereal.pod.template
View File

@ -1876,6 +1876,7 @@ B<http://www.ethereal.com>.
<smhuang [AT] pcs.csie.nctu.edu.tw>
Michael Kopp <michael.kopp [AT] isarnet.de>
Bernd Leibing <bernd.leibing [AT] kiz.uni-ulm.de>
Chris Heath <chris [AT] heathens.co.nz>
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his
permission to use his version of snprintf.c.

27
epan/strutil.c
View File

@ -1,7 +1,7 @@
/* strutil.c
* String utility routines
*
* $Id: strutil.c,v 1.10 2002/12/31 21:51:10 guy Exp $
* $Id: strutil.c,v 1.11 2003/08/01 01:39:00 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -133,6 +133,19 @@ get_token_len(const guchar *linep, const guchar *lineend,
#define INITIAL_FMTBUF_SIZE 128
#ifdef _WIN32
/*
* XXX - "isprint()" can return "true" for non-ASCII characters, but
* those don't work with GTK+ on Windows, as GTK+ on Windows assumes
* UTF-8 strings. Until we fix up Ethereal to properly handle
* non-ASCII characters in all output (both GUI displays and text
* printouts) on all platforms including Windows, we work around
* the problem by escaping all characters that aren't printable ASCII.
*/
#undef isprint
#define isprint(c) (c >= 0x20 && c < 0x7f)
#endif
/*
* Given a string, generate a string from it that shows non-printable
* characters as C-style escapes, and return a pointer to it.
@ -173,19 +186,7 @@ format_text(const guchar *string, int len)
}
c = *string++;
#ifdef _WIN32
/*
* XXX - "isprint()" can return "true" for non-ASCII characters, but
* those don't work with GTK+ on Windows, as GTK+ on Windows assumes
* UTF-8 strings. Until we fix up Ethereal to properly handle
* non-ASCII characters in all output (both GUI displays and text
* printouts) on all platforms including Windows, we work around
* the problem by escaping all characters that aren't printable ASCII.
*/
if (c >= 0x20 && c <= 0x7f) {
#else
if (isprint(c)) {
#endif
fmtbuf[column] = c;
column++;
} else {

4
gtk/gtkglobals.h
View File

@ -1,7 +1,7 @@
/* gtkglobals.h
* GTK-related Global defines, etc.
*
* $Id: gtkglobals.h,v 1.21 2002/12/31 21:49:00 guy Exp $
* $Id: gtkglobals.h,v 1.22 2003/08/01 01:39:01 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -50,7 +50,7 @@ void set_plist_sel_browse(gboolean);
* the problem by escaping all characters that aren't printable ASCII.
*/
#undef isprint
#define isprint(c) (c >= 0x20 && c <= 0x7f)
#define isprint(c) (c >= 0x20 && c < 0x7f)
#endif
#endif