mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-06 02:51:00 +01:00
4c9d538fc8
* glib/gconvert.h: Make hostname parameter const char *. * glib/gconvert.c: (g_unescape_uri_string): Added a new "ASCII must not be escaped" feature, and some missing error checking. (is_escalphanum): New. (is_escalpha): New. (hostname_validate): New. (g_filename_from_uri): Don't allow hostnames to include escaped ASCII, validate hostnames with the new hostname_validate. (g_filename_to_uri): Validate hostnames with the new hostname_validate. * tests/uri-test.c: Updated tests to reflect the hostname validation changes above. * glib/gdate.c: (g_date_fill_parse_tokens): Remove the <ctype.h> include and do isdigit -> g_ascii_isdigit.
124 lines
3.8 KiB
C
124 lines
3.8 KiB
C
/* GLIB - Library of useful routines for C programming
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
/*
|
|
* Modified by the GLib Team and others 1997-2000. See the AUTHORS
|
|
* file for a list of people on the GLib Team. See the ChangeLog
|
|
* files for a list of changes. These files are distributed with
|
|
* GLib at ftp://ftp.gtk.org/pub/gtk/.
|
|
*/
|
|
|
|
#ifndef __G_CONVERT_H__
|
|
#define __G_CONVERT_H__
|
|
|
|
#include <stddef.h> /* For size_t */
|
|
#include <glib/gerror.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
typedef enum
|
|
{
|
|
G_CONVERT_ERROR_NO_CONVERSION,
|
|
G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
|
|
G_CONVERT_ERROR_FAILED,
|
|
G_CONVERT_ERROR_PARTIAL_INPUT,
|
|
G_CONVERT_ERROR_BAD_URI,
|
|
G_CONVERT_ERROR_NOT_ABSOLUTE_PATH
|
|
} GConvertError;
|
|
|
|
#define G_CONVERT_ERROR g_convert_error_quark()
|
|
GQuark g_convert_error_quark (void);
|
|
|
|
/* Thin wrappers around iconv
|
|
*/
|
|
typedef struct _GIConv *GIConv;
|
|
|
|
GIConv g_iconv_open (const gchar *to_codeset,
|
|
const gchar *from_codeset);
|
|
size_t g_iconv (GIConv converter,
|
|
gchar **inbuf,
|
|
gsize *inbytes_left,
|
|
gchar **outbuf,
|
|
gsize *outbytes_left);
|
|
gint g_iconv_close (GIConv converter);
|
|
|
|
|
|
gchar* g_convert (const gchar *str,
|
|
gssize len,
|
|
const gchar *to_codeset,
|
|
const gchar *from_codeset,
|
|
gsize *bytes_read,
|
|
gsize *bytes_written,
|
|
GError **error);
|
|
gchar* g_convert_with_iconv (const gchar *str,
|
|
gssize len,
|
|
GIConv converter,
|
|
gsize *bytes_read,
|
|
gsize *bytes_written,
|
|
GError **error);
|
|
gchar* g_convert_with_fallback (const gchar *str,
|
|
gssize len,
|
|
const gchar *to_codeset,
|
|
const gchar *from_codeset,
|
|
gchar *fallback,
|
|
gsize *bytes_read,
|
|
gsize *bytes_written,
|
|
GError **error);
|
|
|
|
|
|
/* Convert between libc's idea of strings and UTF-8.
|
|
*/
|
|
gchar* g_locale_to_utf8 (const gchar *opsysstring,
|
|
gssize len,
|
|
gsize *bytes_read,
|
|
gsize *bytes_written,
|
|
GError **error);
|
|
gchar* g_locale_from_utf8 (const gchar *utf8string,
|
|
gssize len,
|
|
gsize *bytes_read,
|
|
gsize *bytes_written,
|
|
GError **error);
|
|
|
|
/* Convert between the operating system (or C runtime)
|
|
* representation of file names and UTF-8.
|
|
*/
|
|
gchar* g_filename_to_utf8 (const gchar *opsysstring,
|
|
gssize len,
|
|
gsize *bytes_read,
|
|
gsize *bytes_written,
|
|
GError **error);
|
|
gchar* g_filename_from_utf8 (const gchar *utf8string,
|
|
gssize len,
|
|
gsize *bytes_read,
|
|
gsize *bytes_written,
|
|
GError **error);
|
|
|
|
gchar *g_filename_from_uri (const char *uri,
|
|
char **hostname,
|
|
GError **error);
|
|
|
|
gchar *g_filename_to_uri (const char *filename,
|
|
const char *hostname,
|
|
GError **error);
|
|
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __G_CONVERT_H__ */
|