From fc47a2c83c4b6c6d47f3c73fd3879fc92eb9c4b3 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 19 Jul 1996 21:41:07 +0000 Subject: updated w32 code by tulloh --- w32/include/dirent.h | 74 ++++++++++++++++----------------- w32/include/pathstuff.h | 20 ++++----- w32/include/sub_proc.h | 108 ++++++++++++++++++++++++------------------------ w32/include/w32err.h | 20 ++++----- 4 files changed, 111 insertions(+), 111 deletions(-) (limited to 'w32/include') diff --git a/w32/include/dirent.h b/w32/include/dirent.h index 6bb7fbd..ccc1800 100644 --- a/w32/include/dirent.h +++ b/w32/include/dirent.h @@ -1,37 +1,37 @@ -#ifndef _DIRENT_H -#define _DIRENT_H - -#include -#include -#include -#include - -#ifndef NAME_MAX -#define NAME_MAX 255 -#endif - -#define __DIRENT_COOKIE 0xfefeabab - - -struct dirent -{ - ino_t d_ino; /* unused - no equivalent on WIN32 */ - char d_name[NAME_MAX+1]; -}; - -typedef struct dir_struct { - ULONG dir_ulCookie; - HANDLE dir_hDirHandle; - DWORD dir_nNumFiles; - char dir_pDirectoryName[NAME_MAX+1]; - struct dirent dir_sdReturn; -} DIR; - -DIR *opendir(const char *); -struct dirent *readdir(DIR *); -void rewinddir(DIR *); -void closedir(DIR *); -int telldir(DIR *); -void seekdir(DIR *, long); - -#endif +#ifndef _DIRENT_H +#define _DIRENT_H + +#include +#include +#include +#include + +#ifndef NAME_MAX +#define NAME_MAX 255 +#endif + +#define __DIRENT_COOKIE 0xfefeabab + + +struct dirent +{ + ino_t d_ino; /* unused - no equivalent on WIN32 */ + char d_name[NAME_MAX+1]; +}; + +typedef struct dir_struct { + ULONG dir_ulCookie; + HANDLE dir_hDirHandle; + DWORD dir_nNumFiles; + char dir_pDirectoryName[NAME_MAX+1]; + struct dirent dir_sdReturn; +} DIR; + +DIR *opendir(const char *); +struct dirent *readdir(DIR *); +void rewinddir(DIR *); +void closedir(DIR *); +int telldir(DIR *); +void seekdir(DIR *, long); + +#endif diff --git a/w32/include/pathstuff.h b/w32/include/pathstuff.h index 285ed04..63e7fb0 100644 --- a/w32/include/pathstuff.h +++ b/w32/include/pathstuff.h @@ -1,10 +1,10 @@ -#ifndef _PATHSTUFF_H -#define _PATHSTUFF_H - -extern char * convert_Path_to_win32(char *Path, char to_delim); -extern char * w32ify(char *file, int resolve); -extern char * getcwd_fs(char *buf, int len); - -#define convert_vpath_to_win32(vpath, delim) convert_Path_to_win32(vpath, delim) - -#endif +#ifndef _PATHSTUFF_H +#define _PATHSTUFF_H + +extern char * convert_Path_to_win32(char *Path, char to_delim); +extern char * w32ify(char *file, int resolve); +extern char * getcwd_fs(char *buf, int len); + +#define convert_vpath_to_win32(vpath, delim) convert_Path_to_win32(vpath, delim) + +#endif diff --git a/w32/include/sub_proc.h b/w32/include/sub_proc.h index 12e9cf3..4f1f312 100644 --- a/w32/include/sub_proc.h +++ b/w32/include/sub_proc.h @@ -1,54 +1,54 @@ -#ifndef SUB_PROC_H -#define SUB_PROC_H - -/* - * Component Name: - * - * $Date$ - * - * $Source$ - * - * $Revision$ - * - * Description: - * - * (C) COPYRIGHT TIVOLI Systems, Inc. 1991-1994 - * Unpublished Work - * All Rights Reserved - * Licensed Material - Property of TIVOLI Systems, Inc. - */ - -/* $Id$ */ - -#ifdef WIN32 - -#define EXTERN_DECL(entry, args) extern entry args -#define VOID_DECL void - -EXTERN_DECL(HANDLE process_init, (VOID_DECL)); -EXTERN_DECL(HANDLE process_init_fd, (HANDLE stdinh, HANDLE stdouth, - HANDLE stderrh)); -EXTERN_DECL(long process_begin, (HANDLE proc, char **argv, char **envp, - char *exec_path, char *as_user)); -EXTERN_DECL(long process_pipe_io, (HANDLE proc, char *stdin_data, - int stdin_data_len)); -EXTERN_DECL(long process_file_io, (HANDLE proc)); -EXTERN_DECL(void process_cleanup, (HANDLE proc)); -EXTERN_DECL(HANDLE process_wait_for_any, (VOID_DECL)); -EXTERN_DECL(void process_register, (HANDLE proc)); -EXTERN_DECL(HANDLE process_easy, (char** argv, char** env)); -EXTERN_DECL(BOOL process_kill, (HANDLE proc, int signal)); - -/* support routines */ -EXTERN_DECL(long process_errno, (HANDLE proc)); -EXTERN_DECL(long process_last_err, (HANDLE proc)); -EXTERN_DECL(long process_exit_code, (HANDLE proc)); -EXTERN_DECL(long process_signal, (HANDLE proc)); -EXTERN_DECL(char * process_outbuf, (HANDLE proc)); -EXTERN_DECL(char * process_errbuf, (HANDLE proc)); -EXTERN_DECL(int process_outcnt, (HANDLE proc)); -EXTERN_DECL(int process_errcnt, (HANDLE proc)); -EXTERN_DECL(void process_pipes, (HANDLE proc, int pipes[3])); - -#endif -#endif +#ifndef SUB_PROC_H +#define SUB_PROC_H + +/* + * Component Name: + * + * $Date$ + * + * $Source$ + * + * $Revision$ + * + * Description: + * + * (C) COPYRIGHT TIVOLI Systems, Inc. 1991-1994 + * Unpublished Work + * All Rights Reserved + * Licensed Material - Property of TIVOLI Systems, Inc. + */ + +/* $Id$ */ + +#ifdef WIN32 + +#define EXTERN_DECL(entry, args) extern entry args +#define VOID_DECL void + +EXTERN_DECL(HANDLE process_init, (VOID_DECL)); +EXTERN_DECL(HANDLE process_init_fd, (HANDLE stdinh, HANDLE stdouth, + HANDLE stderrh)); +EXTERN_DECL(long process_begin, (HANDLE proc, char **argv, char **envp, + char *exec_path, char *as_user)); +EXTERN_DECL(long process_pipe_io, (HANDLE proc, char *stdin_data, + int stdin_data_len)); +EXTERN_DECL(long process_file_io, (HANDLE proc)); +EXTERN_DECL(void process_cleanup, (HANDLE proc)); +EXTERN_DECL(HANDLE process_wait_for_any, (VOID_DECL)); +EXTERN_DECL(void process_register, (HANDLE proc)); +EXTERN_DECL(HANDLE process_easy, (char** argv, char** env)); +EXTERN_DECL(BOOL process_kill, (HANDLE proc, int signal)); + +/* support routines */ +EXTERN_DECL(long process_errno, (HANDLE proc)); +EXTERN_DECL(long process_last_err, (HANDLE proc)); +EXTERN_DECL(long process_exit_code, (HANDLE proc)); +EXTERN_DECL(long process_signal, (HANDLE proc)); +EXTERN_DECL(char * process_outbuf, (HANDLE proc)); +EXTERN_DECL(char * process_errbuf, (HANDLE proc)); +EXTERN_DECL(int process_outcnt, (HANDLE proc)); +EXTERN_DECL(int process_errcnt, (HANDLE proc)); +EXTERN_DECL(void process_pipes, (HANDLE proc, int pipes[3])); + +#endif +#endif diff --git a/w32/include/w32err.h b/w32/include/w32err.h index 7e9df78..b48dbbe 100644 --- a/w32/include/w32err.h +++ b/w32/include/w32err.h @@ -1,10 +1,10 @@ -#ifndef _W32ERR_H_ -#define _W32ERR_H_ - -#ifndef EXTERN_DECL -#define EXTERN_DECL(entry, args) entry args -#endif - -EXTERN_DECL(char * map_win32_error_to_string, (DWORD error)); - -#endif /* !_W32ERR_H */ +#ifndef _W32ERR_H_ +#define _W32ERR_H_ + +#ifndef EXTERN_DECL +#define EXTERN_DECL(entry, args) entry args +#endif + +EXTERN_DECL(char * map_win32_error_to_string, (DWORD error)); + +#endif /* !_W32ERR_H */ -- cgit v1.2.3