diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/interface-curses.cpp | 7 | ||||
| -rw-r--r-- | src/ioview.cpp | 14 | ||||
| -rw-r--r-- | src/main.cpp | 10 | ||||
| -rw-r--r-- | src/spawn.cpp | 2 |
4 files changed, 21 insertions, 12 deletions
diff --git a/src/interface-curses.cpp b/src/interface-curses.cpp index b4d83ec..5180d48 100644 --- a/src/interface-curses.cpp +++ b/src/interface-curses.cpp @@ -80,9 +80,12 @@ #endif #ifdef NCURSES_VERSION -#ifdef G_OS_UNIX +#if defined(G_OS_UNIX) || defined(G_OS_HAIKU) /** - * Whether we're on ncurses/UNIX + * Whether we're on ncurses/UNIX. + * Haiku has a UNIX-like terminal and is largely + * POSIX compliant, so we can handle it like a + * UNIX ncurses. */ #define NCURSES_UNIX #elif defined(G_OS_WIN32) diff --git a/src/ioview.cpp b/src/ioview.cpp index 6cab3f9..71b5b9f 100644 --- a/src/ioview.cpp +++ b/src/ioview.cpp @@ -467,7 +467,7 @@ make_savepoint(const gchar *filename) undo.push(new UndoTokenRestoreSavePoint(savepoint, filename)); } -#endif /* !G_OS_UNIX */ +#endif GIOStatus IOView::save(GIOChannel *channel, guint position, gsize len, @@ -603,7 +603,7 @@ IOView::save(const gchar *filename) GError *error = NULL; GIOChannel *channel; -#ifdef G_OS_UNIX +#if defined(G_OS_UNIX) || defined(G_OS_HAIKU) GStatBuf file_stat; file_stat.st_uid = -1; file_stat.st_gid = -1; @@ -612,7 +612,7 @@ IOView::save(const gchar *filename) if (undo.enabled) { if (g_file_test(filename, G_FILE_TEST_IS_REGULAR)) { -#ifdef G_OS_UNIX +#if defined(G_OS_UNIX) || defined(G_OS_HAIKU) g_stat(filename, &file_stat); #endif attributes = get_file_attributes(filename); @@ -644,7 +644,7 @@ IOView::save(const gchar *filename) /* if file existed but has been renamed, restore attributes */ if (attributes != INVALID_FILE_ATTRIBUTES) set_file_attributes(filename, attributes); -#ifdef G_OS_UNIX +#if defined(G_OS_UNIX) || defined(G_OS_HAIKU) /* * only a good try to inherit owner since process user must have * CHOWN capability traditionally reserved to root only. @@ -698,7 +698,7 @@ expand_path(const gchar *path) return ret; } -#ifdef G_OS_UNIX +#if defined(G_OS_UNIX) || defined(G_OS_HAIKU) gchar * get_absolute_path(const gchar *path) @@ -752,7 +752,7 @@ file_is_visible(const gchar *path) return !(get_file_attributes(path) & FILE_ATTRIBUTE_HIDDEN); } -#else /* !G_OS_UNIX && !G_OS_WIN32 */ +#else /* !G_OS_UNIX && !G_OS_HAIKU && !G_OS_WIN32 */ /* * This will never canonicalize relative paths. @@ -791,6 +791,6 @@ file_is_visible(const gchar *path) return true; } -#endif /* !G_OS_UNIX && !G_OS_WIN32 */ +#endif /* !G_OS_UNIX && !G_OS_HAIKU && !G_OS_WIN32 */ } /* namespace SciTECO */ diff --git a/src/main.cpp b/src/main.cpp index 951e5b3..1f89156 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -88,7 +88,7 @@ static gpointer g_realloc_exception(gpointer mem, gsize n_bytes); static void sigint_handler(int signal); } -#ifdef G_OS_UNIX +#if defined(G_OS_UNIX) || defined(G_OS_HAIKU) void interrupt(void) @@ -102,7 +102,7 @@ interrupt(void) sigint_occurred = TRUE; } -#else +#else /* !G_OS_UNIX && !G_OS_HAIKU */ void interrupt(void) @@ -143,6 +143,12 @@ get_default_config_path(const gchar *program) #elif defined(G_OS_UNIX) +/* + * NOTE: We explicitly do not handle + * Haiku like UNIX here, since it appears to + * be uncommon on Haiku to clutter the HOME directory + * with config files. + */ static inline gchar * get_default_config_path(const gchar *program) { diff --git a/src/spawn.cpp b/src/spawn.cpp index cd160f9..4f11ce1 100644 --- a/src/spawn.cpp +++ b/src/spawn.cpp @@ -102,7 +102,7 @@ parse_shell_command_line(const gchar *cmdline, GError **error) }; return g_strdupv((gchar **)argv_win32); } -#elif defined(G_OS_UNIX) +#elif defined(G_OS_UNIX) || defined(G_OS_HAIKU) if (!(Flags::ed & Flags::ED_SHELLEMU)) { const gchar *argv_unix[] = { "/bin/sh", "-c", cmdline, NULL |