[patch] Revised patch

apr-1.2.7.patch (text/plain), 11.10 KB, created by Paul Smedley on 2006-08-06 10:08:24 UTC

(hide)

Description: Revised patch

Filename:

MIME Type:

Creator: Paul Smedley

Created: 2006-08-06 10:08:24 UTC

Size: 11.10 KB

patch

obsolete

>diff -ur apr-1.2.7/build/aplibtool.c apr-1.2.7-os2/build/aplibtool.c >--- apr-1.2.7/build/aplibtool.c Fri Feb 4 13:44:02 2005 >+++ apr-1.2.7-os2/build/aplibtool.c Sun Aug 6 19:22:46 2006 >@@ -36,7 +36,7 @@ > # define CC "gcc" > # define GEN_EXPORTS "emxexp" > # define DEF2IMPLIB_CMD "emximp" >-# define SHARE_SW "-Zdll -Zmtd" >+# define SHARE_SW "-Zdll -Zmap -Zmtd" > # define USE_OMF true > # define TRUNCATE_DLL_NAME > # define DYNAMIC_LIB_EXT "dll" >@@ -45,7 +45,7 @@ > # if USE_OMF > /* OMF is the native format under OS/2 */ > # define STATIC_LIB_EXT "lib" >-# define OBJECT_EXT "obj" >+# define OBJECT_EXT "o" > # define LIBRARIAN "emxomfar" > # else > /* but the alternative, a.out, can fork() which is sometimes necessary */ >Only in apr-1.2.7-os2/build: aplibtool.c# >diff -ur apr-1.2.7/dso/os2/dso.c apr-1.2.7-os2/dso/os2/dso.c >--- apr-1.2.7/dso/os2/dso.c Fri Feb 4 13:44:02 2005 >+++ apr-1.2.7-os2/dso/os2/dso.c Sun Aug 6 19:32:46 2006 >@@ -80,7 +80,16 @@ > if (symname == NULL || ressym == NULL) > return APR_ESYMNOTFOUND; > >- if ((rc = DosQueryProcAddr(handle->handle, 0, symname, &func)) != 0) { >+#if defined(__INNOTEK_LIBC__) >+ void *retval; >+ char *symbol = (char*)malloc(sizeof(char)*(strlen(symname)+2)); >+ sprintf(symbol, "_%s", symname); >+ rc = DosQueryProcAddr(handle->handle, 0, symbol, &func); >+ free(symbol); >+#else >+ rc = DosQueryProcAddr(handle->handle, 0, symname, &func); >+#endif >+ if (rc != 0) { > handle->load_error = APR_FROM_OS_ERROR(rc); > return handle->load_error; > } >diff -ur apr-1.2.7/file_io/os2/open.c apr-1.2.7-os2/file_io/os2/open.c >--- apr-1.2.7/file_io/os2/open.c Wed Jun 29 05:34:38 2005 >+++ apr-1.2.7-os2/file_io/os2/open.c Sun Aug 6 19:36:34 2006 >@@ -28,6 +28,13 @@ > return apr_file_close(file); > } > >+#ifdef __INNOTEK_LIBC__ >+apr_status_t apr_unix_file_cleanup(void *thefile) >+{ >+ apr_file_t *file = thefile; >+ return apr_file_close(file); >+} >+#endif > > > APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new, const char *fname, apr_int32_t flag, apr_fileperms_t perm, apr_pool_t *pool) >diff -ur apr-1.2.7/file_io/os2/readwrite.c apr-1.2.7-os2/file_io/os2/readwrite.c >--- apr-1.2.7/file_io/os2/readwrite.c Thu Feb 23 05:14:36 2006 >+++ apr-1.2.7-os2/file_io/os2/readwrite.c Sun Aug 6 19:36:18 2006 >@@ -331,6 +331,58 @@ > } > > >+/* Pull from unix code to start a sync up */ >+#if (defined(__INNOTEK_LIBC__) || defined(__WATCOMC__) ) >+ >+struct apr_file_printf_data { >+ apr_vformatter_buff_t vbuff; >+ apr_file_t *fptr; >+ char *buf; >+}; >+ >+static int file_printf_flush(apr_vformatter_buff_t *buff) >+{ >+ struct apr_file_printf_data *data = (struct apr_file_printf_data *)buff; >+ >+ if (apr_file_write_full(data->fptr, data->buf, >+ data->vbuff.curpos - data->buf, NULL)) { >+ return -1; >+ } >+ >+ data->vbuff.curpos = data->buf; >+ return 0; >+} >+ >+ >+APR_DECLARE_NONSTD(int) apr_file_printf(apr_file_t *fptr, >+ const char *format, ...) >+{ >+ struct apr_file_printf_data data; >+ va_list ap; >+ int count; >+ >+ /* don't really need a HUGE_STRING_LEN anymore */ >+ data.buf = malloc(HUGE_STRING_LEN); >+ if (data.buf == NULL) { >+ return -1; >+ } >+ data.vbuff.curpos = data.buf; >+ data.vbuff.endpos = data.buf + HUGE_STRING_LEN; >+ data.fptr = fptr; >+ va_start(ap, format); >+ count = apr_vformatter(file_printf_flush, >+ (apr_vformatter_buff_t *)&data, format, ap); >+ /* apr_vformatter does not call flush for the last bits */ >+ if (count >= 0) file_printf_flush((apr_vformatter_buff_t *)&data); >+ >+ va_end(ap); >+ >+ free(data.buf); >+ >+ return count; >+} >+ >+#else > > APR_DECLARE_NONSTD(int) apr_file_printf(apr_file_t *fptr, > const char *format, ...) >@@ -351,7 +403,7 @@ > free(buf); > return (cc == APR_SUCCESS) ? len : -1; > } >- >+#endif > > > apr_status_t apr_file_check_read(apr_file_t *fd) >diff -ur apr-1.2.7/file_io/unix/mktemp.c apr-1.2.7-os2/file_io/unix/mktemp.c >--- apr-1.2.7/file_io/unix/mktemp.c Fri Feb 4 13:44:02 2005 >+++ apr-1.2.7-os2/file_io/unix/mktemp.c Sun Aug 6 19:36:50 2006 >@@ -80,7 +80,9 @@ > #include <fcntl.h> > #endif > #include <stdio.h> >+#ifndef __INNOTEK_LIBC__ > #include <stdlib.h> >+#endif > #include <string.h> > #include <ctype.h> > #ifdef HAVE_TIME_H >@@ -188,6 +190,11 @@ > #else > fd = mkstemp(template); > #endif >+ >+#ifdef __INNOTEK_LIBC__ >+ setmode(fd, O_BINARY); >+#endif >+ > > if (fd == -1) { > return errno; >diff -ur apr-1.2.7/include/apr_network_io.h apr-1.2.7-os2/include/apr_network_io.h >--- apr-1.2.7/include/apr_network_io.h Sun Jun 12 11:54:50 2005 >+++ apr-1.2.7-os2/include/apr_network_io.h Sun Aug 6 19:36:50 2006 >@@ -752,7 +752,7 @@ > * Unset a socket from being inherited by child processes. > */ > APR_DECLARE_INHERIT_UNSET(socket); >- >+#ifndef __INNOTEK_LIBC__ > /** > * @defgroup apr_mcast IP Multicast > * @{ >@@ -814,6 +814,7 @@ > APR_DECLARE(apr_status_t) apr_mcast_interface(apr_socket_t *sock, > apr_sockaddr_t *iface); > >+#endif > /** @} */ > > /** @} */ >diff -ur apr-1.2.7/include/arch/os2/apr_arch_file_io.h apr-1.2.7-os2/include/arch/os2/apr_arch_file_io.h >--- apr-1.2.7/include/arch/os2/apr_arch_file_io.h Sat Jul 16 02:07:42 2005 >+++ apr-1.2.7-os2/include/arch/os2/apr_arch_file_io.h Sun Aug 6 19:36:50 2006 >@@ -29,7 +29,9 @@ > * friendly & is part of the POSIX emulation rather than native so don't > * use it. > */ >+#ifndef __INNOTEK_LIBC__ > #undef HAVE_MKSTEMP >+#endif > > #define APR_FILE_BUFSIZE 4096 > >@@ -45,7 +47,10 @@ > int pipe; > HEV pipeSem; > enum { BLK_UNKNOWN, BLK_OFF, BLK_ON } blocking; >- >+#ifndef WAITIO_USES_POLL >+ /* if there is a timeout set, then this pollset is used */ >+ apr_pollset_t *pollset; >+#endif > /* Stuff for buffered mode */ > char *buffer; > int bufpos; // Read/Write position in buffer >@@ -62,6 +67,11 @@ > FILEFINDBUF3 entry; > int validentry; > }; >+ >+#ifdef __INNOTEK_LIBC__ >+apr_status_t apr_unix_file_cleanup(void *); >+#endif >+ > > apr_status_t apr_file_cleanup(void *); > apr_status_t apr_os2_time_to_apr_time(apr_time_t *result, FDATE os2date, >diff -ur apr-1.2.7/locks/os2/proc_mutex.c apr-1.2.7-os2/locks/os2/proc_mutex.c >--- apr-1.2.7/locks/os2/proc_mutex.c Fri Feb 4 13:44:02 2005 >+++ apr-1.2.7-os2/locks/os2/proc_mutex.c Sun Aug 6 19:36:50 2006 >@@ -115,6 +115,13 @@ > new->owner = 0; > new->lock_count = 0; > >+#ifdef __INNOTEK_LIBC__ >+ if (!fname) { >+ /* Reinitializing unnamed mutexes is a noop in the Unix code. */ >+ return APR_SUCCESS; >+ } >+#endif >+ > semname = fixed_name(fname, pool); > rc = DosOpenMutexSem(semname, &(new->hMutex)); > *mutex = new; >Only in apr-1.2.7-os2: log >diff -ur apr-1.2.7/misc/unix/randbyte_os2.inc apr-1.2.7-os2/misc/unix/randbyte_os2.inc >--- apr-1.2.7/misc/unix/randbyte_os2.inc Tue Jun 14 08:11:30 2005 >+++ apr-1.2.7-os2/misc/unix/randbyte_os2.inc Sun Aug 6 19:36:50 2006 >@@ -62,8 +62,10 @@ > * which is why it's run-time linked. > */ > >+#ifndef __INNOTEK_LIBC__ > static APIRET APIENTRY(*DosPerfSysCall) (ULONG ulCommand, ULONG ulParm1, > ULONG ulParm2, ULONG ulParm3) = NULL; >+#endif > static HMODULE hDoscalls = 0; > #define CMD_KI_RDCNT (0x63) > >@@ -85,6 +87,7 @@ > CPUUTIL util; > int c; > >+#ifndef __INNOTEK_LIBC__ > if (hDoscalls == 0) { > char failed_module[20]; > ULONG rc; >@@ -111,7 +114,7 @@ > DosPerfSysCall = NULL; > } > } >- >+#endif > return byte; > } > >diff -ur apr-1.2.7/network_io/os2/sendrecv.c apr-1.2.7-os2/network_io/os2/sendrecv.c >--- apr-1.2.7/network_io/os2/sendrecv.c Wed Jan 4 20:09:00 2006 >+++ apr-1.2.7-os2/network_io/os2/sendrecv.c Sun Aug 6 19:36:50 2006 >@@ -27,9 +27,11 @@ > apr_ssize_t rv; > int fds, err = 0; > >+#ifndef __INNOTEK_LIBC__ > if (*len > 65536) { > *len = 65536; > } >+#endif > > do { > if (!sock->nonblock || err == SOCEWOULDBLOCK) { >@@ -114,11 +116,17 @@ > int fds, err = 0; > int nv_tosend, total = 0; > >+#ifndef __INNOTEK_LIBC__ > /* Make sure writev() only gets fed 64k at a time */ > for ( nv_tosend = 0; nv_tosend < nvec && total + vec[nv_tosend].iov_len < 65536; nv_tosend++ ) { > total += vec[nv_tosend].iov_len; > } >- >+#else >+ /* workaround for writev() not required with libc */ >+ for ( nv_tosend = 0; nv_tosend < nvec; nv_tosend++ ) { >+ total += vec[nv_tosend].iov_len; >+ } >+#endif > tmpvec = alloca(sizeof(struct iovec) * nv_tosend); > memcpy(tmpvec, vec, sizeof(struct iovec) * nv_tosend); > >diff -ur apr-1.2.7/network_io/os2/sockopt.c apr-1.2.7-os2/network_io/os2/sockopt.c >--- apr-1.2.7/network_io/os2/sockopt.c Fri Feb 4 13:44:02 2005 >+++ apr-1.2.7-os2/network_io/os2/sockopt.c Sun Aug 6 19:36:50 2006 >@@ -24,7 +24,9 @@ > #include <sys/socket.h> > #include <netinet/tcp.h> > #include <netinet/in.h> >+#ifndef __INNOTEK_LIBC__ > #include <unistd.h> >+#endif > #include <netdb.h> > #include <sys/so_ioctl.h> > >Only in apr-1.2.7-os2: patch.log >diff -ur apr-1.2.7/threadproc/unix/signals.c apr-1.2.7-os2/threadproc/unix/signals.c >--- apr-1.2.7/threadproc/unix/signals.c Fri Feb 4 13:44:02 2005 >+++ apr-1.2.7-os2/threadproc/unix/signals.c Sun Aug 6 19:36:50 2006 >@@ -44,7 +44,6 @@ > XCPT_SIGNAL_BREAK)); > } > #endif /* OS2 */ >- > if (kill(proc->pid, signum) == -1) { > return errno; > } >@@ -416,7 +415,7 @@ > sigfillset(&sig_mask); > remove_sync_sigs(&sig_mask); > >-#if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS >+#if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS || defined(OS2) > if ((rv = sigprocmask(SIG_SETMASK, &sig_mask, NULL)) != 0) { > rv = errno; > } >@@ -442,7 +441,7 @@ > > sigaddset(&sig_mask, signum); > >-#if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS >+#if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS || defined(OS2) > if ((rv = sigprocmask(SIG_BLOCK, &sig_mask, NULL)) != 0) { > rv = errno; > } >@@ -469,7 +468,7 @@ > > sigaddset(&sig_mask, signum); > >-#if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS >+#if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS || defined(OS2) > if ((rv = sigprocmask(SIG_UNBLOCK, &sig_mask, NULL)) != 0) { > rv = errno; > } >diff -ur apr-1.2.7/user/unix/userinfo.c apr-1.2.7-os2/user/unix/userinfo.c >--- apr-1.2.7/user/unix/userinfo.c Wed Aug 24 03:42:20 2005 >+++ apr-1.2.7-os2/user/unix/userinfo.c Sun Aug 6 19:36:50 2006 >@@ -77,7 +77,7 @@ > if ((rv = getpwnam_safe(username, &pw, pwbuf)) != APR_SUCCESS) > return rv; > >-#ifdef OS2 >+#if (defined(OS2)&&!defined(__INNOTEK_LIBC__)) > /* Need to manually add user name for OS/2 */ > *dirname = apr_pstrcat(p, pw.pw_dir, pw.pw_name, NULL); > #else View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]