X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=os2%2Fos2ish.h;h=e6cbe108fa6bc7b1ee2441c4af11a0434fb0c4c7;hb=ee964dfe67e839cc40363a15943032d98b77ddcc;hp=23857ac532bbd18435bf072f6f115a43701d42e5;hpb=4b19af017623bfa3bb72bb164598a517f586e0d3;p=p5sagit%2Fp5-mst-13.2.git diff --git a/os2/os2ish.h b/os2/os2ish.h index 23857ac..e6cbe10 100644 --- a/os2/os2ish.h +++ b/os2/os2ish.h @@ -1,4 +1,6 @@ #include +#include +/* #include */ /* HAS_IOCTL: * This symbol, if defined, indicates that the ioctl() routine is @@ -17,6 +19,23 @@ #define HAS_DLERROR #define HAS_WAITPID_RUNTIME (_emx_env & 0x200) +/* HAS_PASSWD + * This symbol, if defined, indicates that the getpwnam() and + * getpwuid() routines are available to get password entries. + * The getpwent() has a separate definition, HAS_GETPWENT. + */ +#define HAS_PASSWD + +/* HAS_GROUP + * This symbol, if defined, indicates that the getgrnam() and + * getgrgid() routines are available to get group entries. + * The getgrent() has a separate definition, HAS_GETGRENT. + */ +#define HAS_GROUP +#define HAS_GETGRENT /* fake */ +#define HAS_SETGRENT /* fake */ +#define HAS_ENDGRENT /* fake */ + /* USEMYBINMODE * This symbol, if defined, indicates that the program should * use the routine my_binmode(FILE *fp, char iotype, int mode) to insure @@ -155,7 +174,6 @@ extern int rc; Perl_croak_nocontext("panic: COND_DESTROY, rc=%i", rc); \ } STMT_END /*#define THR ((struct thread *) TlsGetValue(PL_thr_key)) -#define dTHR struct thread *thr = THR */ #ifdef USE_SLOW_THREAD_SPECIFIC @@ -262,6 +280,18 @@ PerlIO *my_syspopen(pTHX_ char *cmd, char *mode); int my_syspclose(PerlIO *f); FILE *my_tmpfile (void); char *my_tmpnam (char *); +int my_mkdir (__const__ char *, long); +int my_rmdir (__const__ char *); +struct passwd *my_getpwent (void); +void my_setpwent (void); +void my_endpwent (void); + +struct group *getgrent (void); +void setgrent (void); +void endgrent (void); + +struct passwd *my_getpwuid (uid_t); +struct passwd *my_getpwnam (__const__ char *); #undef L_tmpnam #define L_tmpnam MAXPATHLEN @@ -271,6 +301,8 @@ char *my_tmpnam (char *); #define isatty _isterm #define rand random #define srand srandom +#define strtoll _strtoll +#define strtoull _strtoull /* * fwrite1() should be a routine with the same calling sequence as fwrite(), @@ -282,6 +314,13 @@ char *my_tmpnam (char *); #define my_getenv(var) getenv(var) #define flock my_flock +#define rmdir my_rmdir +#define mkdir my_mkdir +#define setpwent my_setpwent +#define getpwent my_getpwent +#define endpwent my_endpwent +#define getpwuid my_getpwuid +#define getpwnam my_getpwnam void *emx_calloc (size_t, size_t); void emx_free (void *); @@ -305,6 +344,9 @@ void *emx_realloc (void *, size_t); ? (--FILE_ptr(fp), ++FILE_cnt(fp), (int)c) : ungetc(c,fp)) #endif +/* ctermid is missing from emx0.9d */ +char *ctermid(char *s); + #define OP_BINARY O_BINARY #define OS2_STAT_HACK 1 @@ -390,6 +432,8 @@ struct PMWIN_entries_t { unsigned long hwndFilter, unsigned long msgFilterFirst, unsigned long msgFilterLast); void * (*DispatchMsg)(unsigned long hab, struct _QMSG *pqmsg); + unsigned long (*GetLastError)(unsigned long hab); + unsigned long (*CancelShutdown)(unsigned long hmq, unsigned long fCancelAlways); }; extern struct PMWIN_entries_t PMWIN_entries; void init_PMWIN_entries(void); @@ -414,9 +458,14 @@ void init_PMWIN_entries(void); #define CheckWinError(expr) ((expr) ? 0: (FillWinError, 1)) #define FillOSError(rc) (os2_setsyserrno(rc), \ Perl_severity = SEVERITY_ERROR) -#define FillWinError (Perl_severity = ERRORIDSEV(Perl_rc), \ - Perl_rc = ERRORIDERROR(Perl_rc)), \ - os2_setsyserrno(Perl_rc) + +/* At this moment init_PMWIN_entries() should be a nop (WinInitialize should + be called already, right?), so we do not risk stepping over our own error */ +#define FillWinError ( init_PMWIN_entries(), \ + Perl_rc=(*PMWIN_entries.GetLastError)(perl_hab_GET()),\ + Perl_severity = ERRORIDSEV(Perl_rc), \ + Perl_rc = ERRORIDERROR(Perl_rc), \ + os2_setsyserrno(Perl_rc)) #define STATIC_FILE_LENGTH 127 @@ -424,6 +473,78 @@ void init_PMWIN_entries(void); char *perllib_mangle(char *, unsigned int); char *os2error(int rc); +int os2_stat(const char *name, struct stat *st); +int setpriority(int which, int pid, int val); +int getpriority(int which /* ignored */, int pid); + +#ifdef PERL_CORE +int os2_do_spawn(pTHX_ char *cmd); +int os2_do_aspawn(pTHX_ SV *really, void **vmark, void **vsp); +#endif + +#ifndef LOG_DAEMON + +/* Replacement for syslog.h */ +# define LOG_EMERG 0 /* system is unusable */ +# define LOG_ALERT 1 /* action must be taken immediately */ +# define LOG_CRIT 2 /* critical conditions */ +# define LOG_ERR 3 /* error conditions */ +# define LOG_WARNING 4 /* warning conditions */ +# define LOG_NOTICE 5 /* normal but significant condition */ +# define LOG_INFO 6 /* informational */ +# define LOG_DEBUG 7 /* debug-level messages */ + +# define LOG_PRIMASK 0x007 /* mask to extract priority part (internal) */ + /* extract priority */ +# define LOG_PRI(p) ((p) & LOG_PRIMASK) +# define LOG_MAKEPRI(fac, pri) (((fac) << 3) | (pri)) + +/* facility codes */ +# define LOG_KERN (0<<3) /* kernel messages */ +# define LOG_USER (1<<3) /* random user-level messages */ +# define LOG_MAIL (2<<3) /* mail system */ +# define LOG_DAEMON (3<<3) /* system daemons */ +# define LOG_AUTH (4<<3) /* security/authorization messages */ +# define LOG_SYSLOG (5<<3) /* messages generated internally by syslogd */ +# define LOG_LPR (6<<3) /* line printer subsystem */ +# define LOG_NEWS (7<<3) /* network news subsystem */ +# define LOG_UUCP (8<<3) /* UUCP subsystem */ +# define LOG_CRON (15<<3) /* clock daemon */ + /* other codes through 15 reserved for system use */ +# define LOG_LOCAL0 (16<<3) /* reserved for local use */ +# define LOG_LOCAL1 (17<<3) /* reserved for local use */ +# define LOG_LOCAL2 (18<<3) /* reserved for local use */ +# define LOG_LOCAL3 (19<<3) /* reserved for local use */ +# define LOG_LOCAL4 (20<<3) /* reserved for local use */ +# define LOG_LOCAL5 (21<<3) /* reserved for local use */ +# define LOG_LOCAL6 (22<<3) /* reserved for local use */ +# define LOG_LOCAL7 (23<<3) /* reserved for local use */ + +# define LOG_NFACILITIES 24 /* current number of facilities */ +# define LOG_FACMASK 0x03f8 /* mask to extract facility part */ + /* facility of pri */ +# define LOG_FAC(p) (((p) & LOG_FACMASK) >> 3) + +/* + * arguments to setlogmask. + */ +# define LOG_MASK(pri) (1 << (pri)) /* mask for one priority */ +# define LOG_UPTO(pri) ((1 << ((pri)+1)) - 1) /* all priorities through pri */ + +/* + * Option flags for openlog. + * + * LOG_ODELAY no longer does anything. + * LOG_NDELAY is the inverse of what it used to be. + */ +# define LOG_PID 0x01 /* log the pid with each message */ +# define LOG_CONS 0x02 /* log on the console if errors in sending */ +# define LOG_ODELAY 0x04 /* delay open until first syslog() (default) */ +# define LOG_NDELAY 0x08 /* don't delay open */ +# define LOG_NOWAIT 0x10 /* don't wait for console forks: DEPRECATED */ +# define LOG_PERROR 0x20 /* log to stderr as well */ + +#endif /* ************************************************************ */ #define Dos32QuerySysState DosQuerySysState