diff options
| author | Dai Sato <satodai@w3m.jp> | 2006-04-07 13:21:11 +0000 |
|---|---|---|
| committer | Dai Sato <satodai@w3m.jp> | 2006-04-07 13:21:11 +0000 |
| commit | 22d66ca5850bf0190aa48d7f4442484f01fc7d02 (patch) | |
| tree | 5b96b7e5bd65f08ad23867bc0738a0fef56f35df /etc.c | |
| parent | apply multiple patches on w3m-dev(-en) ML since Jun 2005 to Jan 2006. (diff) | |
| download | w3m-22d66ca5850bf0190aa48d7f4442484f01fc7d02.tar.gz w3m-22d66ca5850bf0190aa48d7f4442484f01fc7d02.zip | |
rewind to 10 Feb 2006.
Diffstat (limited to 'etc.c')
| -rw-r--r-- | etc.c | 26 |
1 files changed, 1 insertions, 25 deletions
@@ -1,8 +1,6 @@ -/* $Id: etc.c,v 1.79 2006/04/05 14:18:54 inu Exp $ */ +/* $Id: etc.c,v 1.80 2006/04/07 13:21:11 inu Exp $ */ #include "fm.h" -#ifndef __MINGW32_VERSION #include <pwd.h> -#endif #include "myctype.h" #include "html.h" #include "local.h" @@ -1312,13 +1310,9 @@ romanAlphabet(int n) static void reset_signals(void) { -#ifdef SIGHUP mySignal(SIGHUP, SIG_DFL); /* terminate process */ -#endif mySignal(SIGINT, SIG_DFL); /* terminate process */ -#ifdef SIGQUIT mySignal(SIGQUIT, SIG_DFL); /* terminate process */ -#endif mySignal(SIGTERM, SIG_DFL); /* terminate process */ mySignal(SIGILL, SIG_DFL); /* create core image */ mySignal(SIGIOT, SIG_DFL); /* create core image */ @@ -1361,10 +1355,8 @@ setup_child(int child, int i, int f) { reset_signals(); mySignal(SIGINT, SIG_IGN); -#ifndef __MINGW32_VERSION if (!child) SETPGRP(); -#endif /* __MINGW32_VERSION */ close_tty(); close_all_fds_except(i, f); QuietMessage = TRUE; @@ -1372,7 +1364,6 @@ setup_child(int child, int i, int f) TrapSignal = FALSE; } -#ifndef __MINGW32_VERSION pid_t open_pipe_rw(FILE ** fr, FILE ** fw) { @@ -1430,7 +1421,6 @@ open_pipe_rw(FILE ** fr, FILE ** fw) err0: return (pid_t) - 1; } -#endif /* __MINGW32_VERSION */ void myExec(char *command) @@ -1443,7 +1433,6 @@ myExec(char *command) void mySystem(char *command, int background) { -#ifndef __MINGW32_VERSION if (background) { #ifndef __EMX__ flush_tty(); @@ -1458,7 +1447,6 @@ mySystem(char *command, int background) #endif } else -#endif /* __MINGW32_VERSION */ system(command); } @@ -1528,13 +1516,6 @@ myEditor(char *cmd, char *file, int line) return tmp; } -#ifdef __MINGW32_VERSION -char * -expandName(char *name) -{ - return getenv("HOME"); -} -#else char * expandName(char *name) { @@ -1578,7 +1559,6 @@ expandName(char *name) rest: return name; } -#endif char * file_to_url(char *file) @@ -1918,11 +1898,7 @@ mymktime(char *timestr) #ifdef INET6 #include <sys/socket.h> #endif /* INET6 */ -#ifndef __MINGW32_VERSION #include <netdb.h> -#else -#include <winsock.h> -#endif char * FQDN(char *host) { |