diff options
| author | Tor Lillqvist <tml@iki.fi> | 2000-10-16 18:54:29 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2000-10-16 18:54:29 +0000 |
| commit | fb4de1c50d96cd500f53f7701629fd01ec99d7ad (patch) | |
| tree | 510d4ac16e28499234fe8c9f2b3ababaa49d31e1 /gfileutils.c | |
| parent | a626a650e533eba3ee76f4c8375cf41bc964f6cf (diff) | |
| download | glib-fb4de1c50d96cd500f53f7701629fd01ec99d7ad.tar.gz | |
Some more debugging output. (g_io_channel_win32_poll): Remove unused vars.
2000-10-16 Tor Lillqvist <tml@iki.fi>
* giowin32.c (reader_thread): Some more debugging output.
(g_io_channel_win32_poll): Remove unused vars.
* gfileutils.c: Changes for Win32, with no unistd.h and no
S_ISLNK().
* gspawn-win32.c: Implementation of the g_spwan_* functions for
Win32. Due to the general non-Unixness of Win32, much of the
functionality that is relatively clean to implement on Unix, is
hard to do on Win32. We must use a separate helper program to
change directory, close extra file descriptors, redirect the std
ones, as needed, and only then start the child process. No child
process pid can be returned, unfortunately. Or if we used
CreateProcess directly, it probably could. (Now we use the spawnv*
functions from msvcrt.)
* glib.def: Add new entry points.
* glib.def
* giowin32.c: Remove g_io_channel_win32_wait_for_condition(),
g_io_channel_win32_poll() subsumes it.
* gbacktrace.h: G_BREAKPOINT for MSVC (on the ix86).
* gwin32.c (g_win32_getlocale): Use "sp" for
LANG_CROATIAN+SUBLANG_SERBIAN_LATIN.
* makefile.{mingw,msc}.in (glib_OBJECTS): Add new files.
Add gspawn-win32-helper.exe rule.
* tests/makefile.{mingw,msc}.in (TESTS): Add shell-test and
spawn-test.
* tests/spawn-test.c: (run_tests): On Win32, don't try to run
/bin/sh, but ipconfig (no special significance in choosing that,
just a program that outputs something to stdout).
Diffstat (limited to 'gfileutils.c')
| -rw-r--r-- | gfileutils.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/gfileutils.c b/gfileutils.c index 11768526d..74b6ac7f3 100644 --- a/gfileutils.c +++ b/gfileutils.c @@ -18,10 +18,14 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" + #include "glib.h" #include <sys/stat.h> +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif #include <stdio.h> #include <string.h> #include <errno.h> @@ -29,6 +33,9 @@ #include <sys/stat.h> #include <fcntl.h> +#ifndef S_ISLNK +# define S_ISLNK(x) 0 +#endif #define _(x) x @@ -279,6 +286,8 @@ get_contents_stdio (const gchar *filename, return TRUE; } +#ifndef G_OS_WIN32 + static gboolean get_contents_regfile (const gchar *filename, struct stat *stat_buf, @@ -401,7 +410,8 @@ get_contents_posix (const gchar *filename, } } -#ifdef G_OS_WIN32 +#else /* G_OS_WIN32 */ + static gboolean get_contents_win32 (const gchar *filename, gchar **contents, @@ -426,6 +436,7 @@ get_contents_win32 (const gchar *filename, return get_contents_stdio (filename, f, contents, length, error); } + #endif /** @@ -467,4 +478,3 @@ g_file_get_contents (const gchar *filename, return get_contents_posix (filename, contents, length, error); #endif } - |