luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-24 14:36:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Backslashify also '"' characters.

Browse Source 
* gstrfuncs.c (g_strescape): Backslashify also '"' characters.

	* glib.h: Document g_strescape.
This commit is contained in:
Tor Lillqvist 1999-05-29 10:28:06 +00:00
parent e334434a9d
commit 37e447f278
12 changed files with 88 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,10 +1,16 @@
1999-05-29 Tor Lillqvist <tml@iki.fi>
* gstrfuncs.c (g_strescape): Backslashify also '"' characters.
* glib.h: Document g_strescape.
1999-05-12 Tor Lillqvist <tml@iki.fi> 1999-05-12 Tor Lillqvist <tml@iki.fi>
* glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to * glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to
_fstat. _fstat.
* README.win32: Advice also to remove -lmoldname from the * README.win32: Advice also to remove -lmoldname in the
patch to the egcs-1.1.2 spec file patch. patch to the egcs-1.1.2 spec file.
Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org> Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org>

10
ChangeLog.pre-2-0
View File

@ -1,10 +1,16 @@
1999-05-29 Tor Lillqvist <tml@iki.fi>
* gstrfuncs.c (g_strescape): Backslashify also '"' characters.
* glib.h: Document g_strescape.
1999-05-12 Tor Lillqvist <tml@iki.fi> 1999-05-12 Tor Lillqvist <tml@iki.fi>
* glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to * glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to
_fstat. _fstat.
* README.win32: Advice also to remove -lmoldname from the * README.win32: Advice also to remove -lmoldname in the
patch to the egcs-1.1.2 spec file patch. patch to the egcs-1.1.2 spec file.
Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org> Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org>

10
ChangeLog.pre-2-10
View File

@ -1,10 +1,16 @@
1999-05-29 Tor Lillqvist <tml@iki.fi>
* gstrfuncs.c (g_strescape): Backslashify also '"' characters.
* glib.h: Document g_strescape.
1999-05-12 Tor Lillqvist <tml@iki.fi> 1999-05-12 Tor Lillqvist <tml@iki.fi>
* glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to * glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to
_fstat. _fstat.
* README.win32: Advice also to remove -lmoldname from the * README.win32: Advice also to remove -lmoldname in the
patch to the egcs-1.1.2 spec file patch. patch to the egcs-1.1.2 spec file.
Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org> Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org>

10
ChangeLog.pre-2-12
View File

@ -1,10 +1,16 @@
1999-05-29 Tor Lillqvist <tml@iki.fi>
* gstrfuncs.c (g_strescape): Backslashify also '"' characters.
* glib.h: Document g_strescape.
1999-05-12 Tor Lillqvist <tml@iki.fi> 1999-05-12 Tor Lillqvist <tml@iki.fi>
* glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to * glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to
_fstat. _fstat.
* README.win32: Advice also to remove -lmoldname from the * README.win32: Advice also to remove -lmoldname in the
patch to the egcs-1.1.2 spec file patch. patch to the egcs-1.1.2 spec file.
Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org> Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org>

10
ChangeLog.pre-2-2
View File

@ -1,10 +1,16 @@
1999-05-29 Tor Lillqvist <tml@iki.fi>
* gstrfuncs.c (g_strescape): Backslashify also '"' characters.
* glib.h: Document g_strescape.
1999-05-12 Tor Lillqvist <tml@iki.fi> 1999-05-12 Tor Lillqvist <tml@iki.fi>
* glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to * glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to
_fstat. _fstat.
* README.win32: Advice also to remove -lmoldname from the * README.win32: Advice also to remove -lmoldname in the
patch to the egcs-1.1.2 spec file patch. patch to the egcs-1.1.2 spec file.
Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org> Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org>

10
ChangeLog.pre-2-4
View File

@ -1,10 +1,16 @@
1999-05-29 Tor Lillqvist <tml@iki.fi>
* gstrfuncs.c (g_strescape): Backslashify also '"' characters.
* glib.h: Document g_strescape.
1999-05-12 Tor Lillqvist <tml@iki.fi> 1999-05-12 Tor Lillqvist <tml@iki.fi>
* glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to * glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to
_fstat. _fstat.
* README.win32: Advice also to remove -lmoldname from the * README.win32: Advice also to remove -lmoldname in the
patch to the egcs-1.1.2 spec file patch. patch to the egcs-1.1.2 spec file.
Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org> Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org>

10
ChangeLog.pre-2-6
View File

@ -1,10 +1,16 @@
1999-05-29 Tor Lillqvist <tml@iki.fi>
* gstrfuncs.c (g_strescape): Backslashify also '"' characters.
* glib.h: Document g_strescape.
1999-05-12 Tor Lillqvist <tml@iki.fi> 1999-05-12 Tor Lillqvist <tml@iki.fi>
* glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to * glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to
_fstat. _fstat.
* README.win32: Advice also to remove -lmoldname from the * README.win32: Advice also to remove -lmoldname in the
patch to the egcs-1.1.2 spec file patch. patch to the egcs-1.1.2 spec file.
Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org> Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org>

10
ChangeLog.pre-2-8
View File

@ -1,10 +1,16 @@
1999-05-29 Tor Lillqvist <tml@iki.fi>
* gstrfuncs.c (g_strescape): Backslashify also '"' characters.
* glib.h: Document g_strescape.
1999-05-12 Tor Lillqvist <tml@iki.fi> 1999-05-12 Tor Lillqvist <tml@iki.fi>
* glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to * glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to
_fstat. _fstat.
* README.win32: Advice also to remove -lmoldname from the * README.win32: Advice also to remove -lmoldname in the
patch to the egcs-1.1.2 spec file patch. patch to the egcs-1.1.2 spec file.
Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org> Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org>

4
glib.h
View File

@ -1551,7 +1551,11 @@ gchar* g_strconcat (const gchar *string1,
...); /* NULL terminated */ ...); /* NULL terminated */
gchar* g_strjoin (const gchar *separator, gchar* g_strjoin (const gchar *separator,
...); /* NULL terminated */ ...); /* NULL terminated */
/* Return a duplicate of the string with \ and " characters escaped by
* a \. The returned string should be freed with g_free().
*/
gchar* g_strescape (gchar *string); gchar* g_strescape (gchar *string);
gpointer g_memdup (gconstpointer mem, gpointer g_memdup (gconstpointer mem,
guint byte_size); guint byte_size);

4
glib/glib.h
View File

@ -1551,7 +1551,11 @@ gchar* g_strconcat (const gchar *string1,
...); /* NULL terminated */ ...); /* NULL terminated */
gchar* g_strjoin (const gchar *separator, gchar* g_strjoin (const gchar *separator,
...); /* NULL terminated */ ...); /* NULL terminated */
/* Return a duplicate of the string with \ and " characters escaped by
* a \. The returned string should be freed with g_free().
*/
gchar* g_strescape (gchar *string); gchar* g_strescape (gchar *string);
gpointer g_memdup (gconstpointer mem, gpointer g_memdup (gconstpointer mem,
guint byte_size); guint byte_size);

13
glib/gstrfuncs.c
View File

@ -1074,25 +1074,28 @@ g_strescape (gchar *string)
{ {
gchar *q; gchar *q;
gchar *escaped; gchar *escaped;
guint backslashes = 0; guint escapes_needed = 0;
gchar *p = string; gchar *p = string;
g_return_val_if_fail (string != NULL, NULL); g_return_val_if_fail (string != NULL, NULL);
while (*p != '\000') while (*p != '\000')
backslashes += (*p++ == '\\'); {
escapes_needed += (*p == '\\' || *p == '"');
p++;
}
if (!backslashes) if (!escapes_needed)
return g_strdup (string); return g_strdup (string);
escaped = g_new (gchar, strlen (string) + backslashes + 1); escaped = g_new (gchar, strlen (string) + escapes_needed + 1);
p = string; p = string;
q = escaped; q = escaped;
while (*p != '\000') while (*p != '\000')
{ {
if (*p == '\\') if (*p == '\\' || *p == '"')
*q++ = '\\'; *q++ = '\\';
*q++ = *p++; *q++ = *p++;
} }

13
gstrfuncs.c
View File

@ -1074,25 +1074,28 @@ g_strescape (gchar *string)
{ {
gchar *q; gchar *q;
gchar *escaped; gchar *escaped;
guint backslashes = 0; guint escapes_needed = 0;
gchar *p = string; gchar *p = string;
g_return_val_if_fail (string != NULL, NULL); g_return_val_if_fail (string != NULL, NULL);
while (*p != '\000') while (*p != '\000')
backslashes += (*p++ == '\\'); {
escapes_needed += (*p == '\\' || *p == '"');
p++;
}
if (!backslashes) if (!escapes_needed)
return g_strdup (string); return g_strdup (string);
escaped = g_new (gchar, strlen (string) + backslashes + 1); escaped = g_new (gchar, strlen (string) + escapes_needed + 1);
p = string; p = string;
q = escaped; q = escaped;
while (*p != '\000') while (*p != '\000')
{ {
if (*p == '\\') if (*p == '\\' || *p == '"')
*q++ = '\\'; *q++ = '\\';
*q++ = *p++; *q++ = *p++;
} }