Don't use G_DISABLE_DEPRECATED guards around deprecated functions

[platform/upstream/glib.git] / glib / gfileutils.h

diff --git a/glib/gfileutils.h b/glib/gfileutils.h
index 76669f8..f591461 100644 (file)
--- a/glib/gfileutils.h
+++ b/glib/gfileutils.h
@@ -18,6 +18,10 @@
  *   Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
 #ifndef __G_FILEUTILS_H__
 #define __G_FILEUTILS_H__
 
@@ -52,10 +56,11 @@ typedef enum
   G_FILE_ERROR_INTR,
   G_FILE_ERROR_IO,
   G_FILE_ERROR_PERM,
+  G_FILE_ERROR_NOSYS,
   G_FILE_ERROR_FAILED
 } GFileError;
 
-/* For backward-compat reasons, these are synced to an old 
+/* For backward-compat reasons, these are synced to an old
  * anonymous enum in libgnome. But don't use that enum
  * in new code.
  */
@@ -72,31 +77,100 @@ GQuark     g_file_error_quark      (void);
 /* So other code can generate a GFileError */
 GFileError g_file_error_from_errno (gint err_no);
 
+#ifndef __GTK_DOC_IGNORE__
+#ifdef G_OS_WIN32
+#define g_file_test g_file_test_utf8
+#define g_file_get_contents g_file_get_contents_utf8
+#define g_mkstemp g_mkstemp_utf8
+#define g_file_open_tmp g_file_open_tmp_utf8
+#endif
+#endif
+
 gboolean g_file_test         (const gchar  *filename,
                               GFileTest     test);
 gboolean g_file_get_contents (const gchar  *filename,
                               gchar       **contents,
-                              gsize        *length,    
+                              gsize        *length,
+                              GError      **error);
+gboolean g_file_set_contents (const gchar *filename,
+                              const gchar *contents,
+                              gssize         length,
+                              GError       **error);
+gchar   *g_file_read_link    (const gchar  *filename,
                               GError      **error);
-gchar * g_read_link          (const gchar  *filename,
-                             GError      **error);
+
+/* Wrapper / workalike for mkdtemp() */
+gchar   *g_mkdtemp            (gchar        *tmpl);
+gchar   *g_mkdtemp_full       (gchar        *tmpl,
+                               gint          mode);
 
 /* Wrapper / workalike for mkstemp() */
-int     g_mkstemp            (char         *tmpl);
+gint     g_mkstemp            (gchar        *tmpl);
+gint     g_mkstemp_full       (gchar        *tmpl,
+                               gint          flags,
+                               gint          mode);
 
-/* Wrapper for g_mkstemp */
-int     g_file_open_tmp      (const char   *tmpl,
-                             char        **name_used,
-                             GError      **error);
+/* Wrappers for g_mkstemp and g_mkdtemp() */
+gint     g_file_open_tmp      (const gchar  *tmpl,
+                               gchar       **name_used,
+                               GError      **error);
+gchar   *g_dir_make_tmp       (const gchar  *tmpl,
+                               GError      **error);
 
-gchar *g_build_path     (const gchar *separator,
-                        const gchar *first_element,
-                        ...);
-gchar *g_build_filename (const gchar *first_element,
-                        ...);
+gchar   *g_build_path         (const gchar *separator,
+                               const gchar *first_element,
+                               ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
+gchar   *g_build_pathv        (const gchar  *separator,
+                               gchar       **args) G_GNUC_MALLOC;
 
-G_END_DECLS
+gchar   *g_build_filename     (const gchar *first_element,
+                               ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
+gchar   *g_build_filenamev    (gchar      **args) G_GNUC_MALLOC;
 
-#endif /* __G_FILEUTILS_H__ */
+gint     g_mkdir_with_parents (const gchar *pathname,
+                               gint         mode);
+
+#ifdef G_OS_WIN32
+
+/* On Win32, the canonical directory separator is the backslash, and
+ * the search path separator is the semicolon. Note that also the
+ * (forward) slash works as directory separator.
+ */
+#define G_DIR_SEPARATOR '\\'
+#define G_DIR_SEPARATOR_S "\\"
+#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR || (c) == '/')
+#define G_SEARCHPATH_SEPARATOR ';'
+#define G_SEARCHPATH_SEPARATOR_S ";"
 
+#else  /* !G_OS_WIN32 */
 
+#define G_DIR_SEPARATOR '/'
+#define G_DIR_SEPARATOR_S "/"
+#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR)
+#define G_SEARCHPATH_SEPARATOR ':'
+#define G_SEARCHPATH_SEPARATOR_S ":"
+
+#endif /* !G_OS_WIN32 */
+
+gboolean     g_path_is_absolute (const gchar *file_name);
+const gchar *g_path_skip_root   (const gchar *file_name);
+
+GLIB_DEPRECATED_FOR(g_path_get_basename)
+const gchar *g_basename         (const gchar *file_name);
+#ifndef G_DISABLE_DEPRECATED
+#define g_dirname g_path_get_dirname
+#endif
+
+#ifndef __GTK_DOC_IGNORE__
+#ifdef G_OS_WIN32
+#define g_get_current_dir g_get_current_dir_utf8
+#endif
+#endif
+
+gchar *g_get_current_dir   (void);
+gchar *g_path_get_basename (const gchar *file_name) G_GNUC_MALLOC;
+gchar *g_path_get_dirname  (const gchar *file_name) G_GNUC_MALLOC;
+
+G_END_DECLS
+
+#endif /* __G_FILEUTILS_H__ */