delete app

Change-Id: Id4c572809969ebe89e946e88063eaed262cff3f2
Signed-off-by: hongbotian <hongbo.tianhongbo@huawei.com>

5 files changed, 0 insertions, 971 deletions

diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/Makefile.in
deleted file mode 100644
index 3cc12ad7..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = \
-	proc.lo \
-	thread.lo \
-	threadpriv.lo \
-	signals.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/@OSDIR@
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/proc.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/proc.c
deleted file mode 100644
index d57df5ea..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/proc.c
+++ /dev/null
@@ -1,605 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define INCL_DOS
-#define INCL_DOSERRORS
-
-#include "apr_arch_threadproc.h"
-#include "apr_arch_file_io.h"
-#include "apr_private.h"
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_portable.h"
-#include "apr_strings.h"
-#include "apr_signal.h"
-#include <signal.h>
-#include <string.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <process.h>
-#include <stdlib.h>
-
-APR_DECLARE(apr_status_t) apr_procattr_create(apr_procattr_t **new, apr_pool_t *pool)
-{
-    (*new) = (apr_procattr_t *)apr_palloc(pool, 
-              sizeof(apr_procattr_t));
-
-    if ((*new) == NULL) {
-        return APR_ENOMEM;
-    }
-    (*new)->pool = pool;
-    (*new)->parent_in = NULL;
-    (*new)->child_in = NULL;
-    (*new)->parent_out = NULL;
-    (*new)->child_out = NULL;
-    (*new)->parent_err = NULL;
-    (*new)->child_err = NULL;
-    (*new)->currdir = NULL; 
-    (*new)->cmdtype = APR_PROGRAM;
-    (*new)->detached = FALSE;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr, apr_int32_t in, 
-                                              apr_int32_t out, apr_int32_t err)
-{
-    apr_status_t stat;
-    if (in) {
-        if ((stat = apr_file_pipe_create(&attr->child_in, &attr->parent_in,
-                                   attr->pool)) != APR_SUCCESS) {
-            return stat;
-        }
-        switch (in) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_in, 0);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_in, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(attr->child_in, 0);
-            apr_file_pipe_timeout_set(attr->parent_in, 0);
-        }
-    } 
-    if (out) {
-        if ((stat = apr_file_pipe_create(&attr->parent_out, &attr->child_out,
-                                   attr->pool)) != APR_SUCCESS) {
-            return stat;
-        }
-        switch (out) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_out, 0);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_out, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(attr->child_out, 0);
-            apr_file_pipe_timeout_set(attr->parent_out, 0);
-        }
-    } 
-    if (err) {
-        if ((stat = apr_file_pipe_create(&attr->parent_err, &attr->child_err,
-                                   attr->pool)) != APR_SUCCESS) {
-            return stat;
-        }
-        switch (err) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_err, 0);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_err, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(attr->child_err, 0);
-            apr_file_pipe_timeout_set(attr->parent_err, 0);
-        }
-    } 
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_child_in_set(apr_procattr_t *attr, apr_file_t *child_in,
-                                                    apr_file_t *parent_in)
-{
-    if (attr->child_in == NULL && attr->parent_in == NULL)
-        apr_file_pipe_create(&attr->child_in, &attr->parent_in, attr->pool);
-
-    if (child_in != NULL)
-        apr_file_dup(&attr->child_in, child_in, attr->pool);
-
-    if (parent_in != NULL)
-        apr_file_dup(&attr->parent_in, parent_in, attr->pool);
-
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_procattr_child_out_set(apr_procattr_t *attr, apr_file_t *child_out,
-                                                     apr_file_t *parent_out)
-{
-    if (attr->child_out == NULL && attr->parent_out == NULL)
-        apr_file_pipe_create(&attr->child_out, &attr->parent_out, attr->pool);
-
-    if (child_out != NULL)
-        apr_file_dup(&attr->child_out, child_out, attr->pool);
-
-    if (parent_out != NULL)
-        apr_file_dup(&attr->parent_out, parent_out, attr->pool);
-
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_procattr_child_err_set(apr_procattr_t *attr, apr_file_t *child_err,
-                                                     apr_file_t *parent_err)
-{
-    if (attr->child_err == NULL && attr->parent_err == NULL)
-        apr_file_pipe_create(&attr->child_err, &attr->parent_err, attr->pool);
-
-    if (child_err != NULL)
-        apr_file_dup(&attr->child_err, child_err, attr->pool);
-
-    if (parent_err != NULL)
-        apr_file_dup(&attr->parent_err, parent_err, attr->pool);
-
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_procattr_dir_set(apr_procattr_t *attr, const char *dir)
-{
-    attr->currdir = apr_pstrdup(attr->pool, dir);
-    if (attr->currdir) {
-        return APR_SUCCESS;
-    }
-    return APR_ENOMEM;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_cmdtype_set(apr_procattr_t *attr,
-                                                   apr_cmdtype_e cmd) 
-{
-    attr->cmdtype = cmd;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_detach_set(apr_procattr_t *attr, apr_int32_t detach) 
-{
-    attr->detached = detach;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_fork(apr_proc_t *proc, apr_pool_t *pool)
-{
-    int pid;
-    
-    if ((pid = fork()) < 0) {
-        return errno;
-    }
-    else if (pid == 0) {
-        proc->pid = pid;
-        proc->in = NULL; 
-        proc->out = NULL; 
-        proc->err = NULL; 
-        return APR_INCHILD;
-    }
-    proc->pid = pid;
-    proc->in = NULL; 
-    proc->out = NULL; 
-    proc->err = NULL; 
-    return APR_INPARENT;
-}
-
-
-
-/* quotes in the string are doubled up.
- * Used to escape quotes in args passed to OS/2's cmd.exe
- */
-static char *double_quotes(apr_pool_t *pool, const char *str)
-{
-    int num_quotes = 0;
-    int len = 0;
-    char *quote_doubled_str, *dest;
-    
-    while (str[len]) {
-        num_quotes += str[len++] == '\"';
-    }
-    
-    quote_doubled_str = apr_palloc(pool, len + num_quotes + 1);
-    dest = quote_doubled_str;
-    
-    while (*str) {
-        if (*str == '\"')
-            *(dest++) = '\"';
-        *(dest++) = *(str++);
-    }
-    
-    *dest = 0;
-    return quote_doubled_str;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_procattr_child_errfn_set(apr_procattr_t *attr,
-                                                       apr_child_errfn_t *errfn)
-{
-    /* won't ever be called on this platform, so don't save the function pointer */
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_procattr_error_check_set(apr_procattr_t *attr,
-                                                       apr_int32_t chk)
-{
-    /* won't ever be used on this platform, so don't save the flag */
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_addrspace_set(apr_procattr_t *attr,
-                                                       apr_int32_t addrspace)
-{
-    /* won't ever be used on this platform, so don't save the flag */
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *proc, const char *progname,
-                                          const char * const *args,
-                                          const char * const *env,
-                                          apr_procattr_t *attr, apr_pool_t *pool)
-{
-    int i, arg, numargs, cmdlen;
-    apr_status_t status;
-    const char **newargs;
-    char savedir[300];
-    HFILE save_in, save_out, save_err, dup;
-    int criticalsection = FALSE;
-    char *extension, *newprogname, *extra_arg = NULL, *cmdline, *cmdline_pos;
-    char interpreter[1024];
-    char error_object[260];
-    apr_file_t *progfile;
-    int env_len, e;
-    char *env_block, *env_block_pos;
-    RESULTCODES rescodes;
-
-    /* Prevent other threads from running while these process-wide resources are modified */
-    if (attr->child_in || attr->child_out || attr->child_err || attr->currdir) {
-        criticalsection = TRUE;
-        DosEnterCritSec();
-    }
-
-    if (attr->child_in) {
-        save_in = -1;
-        DosDupHandle(STDIN_FILENO, &save_in);
-        dup = STDIN_FILENO;
-        DosDupHandle(attr->child_in->filedes, &dup);
-        DosSetFHState(attr->parent_in->filedes, OPEN_FLAGS_NOINHERIT);
-    }
-    
-    if (attr->child_out) {
-        save_out = -1;
-        DosDupHandle(STDOUT_FILENO, &save_out);
-        dup = STDOUT_FILENO;
-        DosDupHandle(attr->child_out->filedes, &dup);
-        DosSetFHState(attr->parent_out->filedes, OPEN_FLAGS_NOINHERIT);
-    }
-    
-    if (attr->child_err) {
-        save_err = -1;
-        DosDupHandle(STDERR_FILENO, &save_err);
-        dup = STDERR_FILENO;
-        DosDupHandle(attr->child_err->filedes, &dup);
-        DosSetFHState(attr->parent_err->filedes, OPEN_FLAGS_NOINHERIT);
-    }
-
-    apr_signal(SIGCHLD, SIG_DFL); /*not sure if this is needed or not */
-
-    if (attr->currdir != NULL) {
-        _getcwd2(savedir, sizeof(savedir));
-        
-        if (_chdir2(attr->currdir) < 0) {
-            if (criticalsection)
-                DosExitCritSec();
-            return errno;
-        }
-    }
-
-    interpreter[0] = 0;
-    extension = strrchr(progname, '.');
-
-    if (extension == NULL || strchr(extension, '/') || strchr(extension, '\\'))
-        extension = "";
-
-    /* ### how to handle APR_PROGRAM_ENV and APR_PROGRAM_PATH? */
-
-    if (attr->cmdtype == APR_SHELLCMD ||
-        attr->cmdtype == APR_SHELLCMD_ENV ||
-        strcasecmp(extension, ".cmd") == 0) {
-        strcpy(interpreter, "#!" SHELL_PATH);
-        extra_arg = "/C";
-    } else if (stricmp(extension, ".exe") != 0) {
-        status = apr_file_open(&progfile, progname, APR_READ|APR_BUFFERED, 0, pool);
-
-        if (status != APR_SUCCESS && APR_STATUS_IS_ENOENT(status)) {
-            progname = apr_pstrcat(pool, progname, ".exe", NULL);
-        }
-
-        if (status == APR_SUCCESS) {
-            status = apr_file_gets(interpreter, sizeof(interpreter), progfile);
-
-            if (status == APR_SUCCESS) {
-                if (interpreter[0] == '#' && interpreter[1] == '!') {
-                    /* delete CR/LF & any other whitespace off the end */
-                    int end = strlen(interpreter) - 1;
-
-                    while (end >= 0 && apr_isspace(interpreter[end])) {
-                        interpreter[end] = '\0';
-                        end--;
-                    }
-
-                    if (interpreter[2] != '/' && interpreter[2] != '\\' && interpreter[3] != ':') {
-                        char buffer[300];
-
-                        if (DosSearchPath(SEARCH_ENVIRONMENT, "PATH", interpreter+2, buffer, sizeof(buffer)) == 0) {
-                            strcpy(interpreter+2, buffer);
-                        } else {
-                            strcat(interpreter, ".exe");
-                            if (DosSearchPath(SEARCH_ENVIRONMENT, "PATH", interpreter+2, buffer, sizeof(buffer)) == 0) {
-                                strcpy(interpreter+2, buffer);
-                            }
-                        }
-                    }
-                } else {
-                    interpreter[0] = 0;
-                }
-            }
-
-            apr_file_close(progfile);
-        }
-    }
-
-    i = 0;
-
-    while (args && args[i]) {
-        i++;
-    }
-
-    newargs = (const char **)apr_palloc(pool, sizeof (char *) * (i + 4));
-    numargs = 0;
-
-    if (interpreter[0])
-        newargs[numargs++] = interpreter + 2;
-    if (extra_arg)
-        newargs[numargs++] = "/c";
-
-    newargs[numargs++] = newprogname = apr_pstrdup(pool, progname);
-    arg = 1;
-
-    while (args && args[arg]) {
-        newargs[numargs++] = args[arg++];
-    }
-
-    newargs[numargs] = NULL;
-
-    for (i=0; newprogname[i]; i++)
-        if (newprogname[i] == '/')
-            newprogname[i] = '\\';
-
-    cmdlen = 0;
-
-    for (i=0; i<numargs; i++)
-        cmdlen += strlen(newargs[i]) + 3;
-
-    cmdline = apr_palloc(pool, cmdlen + 2);
-    cmdline_pos = cmdline;
-
-    for (i=0; i<numargs; i++) {
-        const char *a = newargs[i];
-
-        if (strpbrk(a, "&|<>\" "))
-            a = apr_pstrcat(pool, "\"", double_quotes(pool, a), "\"", NULL);
-
-        if (i)
-            *(cmdline_pos++) = ' ';
-
-        strcpy(cmdline_pos, a);
-        cmdline_pos += strlen(cmdline_pos);
-    }
-
-    *(++cmdline_pos) = 0; /* Add required second terminator */
-    cmdline_pos = strchr(cmdline, ' ');
-
-    if (cmdline_pos) {
-        *cmdline_pos = 0;
-        cmdline_pos++;
-    }
-
-    /* Create environment block from list of envariables */
-    if (env) {
-        for (env_len=1, e=0; env[e]; e++)
-            env_len += strlen(env[e]) + 1;
-
-        env_block = apr_palloc(pool, env_len);
-        env_block_pos = env_block;
-
-        for (e=0; env[e]; e++) {
-            strcpy(env_block_pos, env[e]);
-            env_block_pos += strlen(env_block_pos) + 1;
-        }
-
-        *env_block_pos = 0; /* environment block is terminated by a double null */
-    } else
-        env_block = NULL;
-
-    status = DosExecPgm(error_object, sizeof(error_object),
-                        attr->detached ? EXEC_BACKGROUND : EXEC_ASYNCRESULT,
-                        cmdline, env_block, &rescodes, cmdline);
-
-    proc->pid = rescodes.codeTerminate;
-
-    if (attr->currdir != NULL) {
-        chdir(savedir);
-    }
-
-    if (attr->child_in) {
-        apr_file_close(attr->child_in);
-        dup = STDIN_FILENO;
-        DosDupHandle(save_in, &dup);
-        DosClose(save_in);
-    }
-    
-    if (attr->child_out) {
-        apr_file_close(attr->child_out);
-        dup = STDOUT_FILENO;
-        DosDupHandle(save_out, &dup);
-        DosClose(save_out);
-    }
-    
-    if (attr->child_err) {
-        apr_file_close(attr->child_err);
-        dup = STDERR_FILENO;
-        DosDupHandle(save_err, &dup);
-        DosClose(save_err);
-    }
-
-    if (criticalsection)
-        DosExitCritSec();
-
-    proc->in = attr->parent_in;
-    proc->err = attr->parent_err;
-    proc->out = attr->parent_out;
-    return status;
-}
-
-
-
-static void proces_result_codes(RESULTCODES codes, 
-                                int *exitcode, 
-                                apr_exit_why_e *exitwhy)
-{
-    int result = 0;
-    apr_exit_why_e why = APR_PROC_EXIT;
-
-    switch (codes.codeTerminate) {
-    case TC_EXIT:        /* Normal exit */
-        why = APR_PROC_EXIT;
-        result = codes.codeResult;
-        break;
-
-    case TC_HARDERROR:   /* Hard error halt */
-        why = APR_PROC_SIGNAL;
-        result = SIGSYS;
-        break;
-
-    case TC_KILLPROCESS: /* Was killed by a DosKillProcess() */
-        why = APR_PROC_SIGNAL;
-        result = SIGKILL;
-        break;
-
-    case TC_TRAP:        /* TRAP in 16 bit code */
-    case TC_EXCEPTION:   /* Threw an exception (32 bit code) */
-        why = APR_PROC_SIGNAL;
-
-        switch (codes.codeResult | XCPT_FATAL_EXCEPTION) {
-        case XCPT_ACCESS_VIOLATION:
-            result = SIGSEGV;
-            break;
-
-        case XCPT_ILLEGAL_INSTRUCTION:
-            result = SIGILL;
-            break;
-
-        case XCPT_FLOAT_DIVIDE_BY_ZERO:
-        case XCPT_INTEGER_DIVIDE_BY_ZERO:
-            result = SIGFPE;
-            break;
-
-        default:
-            result = codes.codeResult;
-            break;
-        }
-    }
-
-    if (exitcode) {
-        *exitcode = result;
-    }
-
-    if (exitwhy) {
-        *exitwhy = why;
-    }
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_proc_wait_all_procs(apr_proc_t *proc,
-                                                  int *exitcode,
-                                                  apr_exit_why_e *exitwhy,
-                                                  apr_wait_how_e waithow,
-                                                  apr_pool_t *p)
-{
-    RESULTCODES codes;
-    ULONG rc;
-    PID pid;
-
-    rc = DosWaitChild(DCWA_PROCESSTREE, waithow == APR_WAIT ? DCWW_WAIT : DCWW_NOWAIT, &codes, &pid, 0);
-
-    if (rc == 0) {
-        proc->pid = pid;
-        proces_result_codes(codes, exitcode, exitwhy);
-        return APR_CHILD_DONE;
-    } else if (rc == ERROR_CHILD_NOT_COMPLETE) {
-        return APR_CHILD_NOTDONE;
-    }
-
-    return APR_OS2_STATUS(rc);
-} 
-
-
-
-APR_DECLARE(apr_status_t) apr_proc_wait(apr_proc_t *proc,
-                                        int *exitcode, apr_exit_why_e *exitwhy,
-                                        apr_wait_how_e waithow)
-{
-    RESULTCODES codes;
-    ULONG rc;
-    PID pid;
-    rc = DosWaitChild(DCWA_PROCESS, waithow == APR_WAIT ? DCWW_WAIT : DCWW_NOWAIT, &codes, &pid, proc->pid);
-
-    if (rc == 0) {
-        proces_result_codes(codes, exitcode, exitwhy);
-        return APR_CHILD_DONE;
-    } else if (rc == ERROR_CHILD_NOT_COMPLETE) {
-        return APR_CHILD_NOTDONE;
-    }
-
-    return APR_OS2_STATUS(rc);
-} 
-
-
-
-APR_DECLARE(apr_status_t) apr_proc_detach(int daemonize)
-{
-    return APR_ENOTIMPL;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/signals.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/signals.c
deleted file mode 100644
index e1727125..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/signals.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../unix/signals.c"
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/thread.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/thread.c
deleted file mode 100644
index e0f32561..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/thread.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define INCL_DOSERRORS
-#define INCL_DOS
-#include "apr_arch_threadproc.h"
-#include "apr_thread_proc.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_portable.h"
-#include "apr_arch_file_io.h"
-#include <stdlib.h>
-
-APR_DECLARE(apr_status_t) apr_threadattr_create(apr_threadattr_t **new, apr_pool_t *pool)
-{
-    (*new) = (apr_threadattr_t *)apr_palloc(pool, sizeof(apr_threadattr_t));
-
-    if ((*new) == NULL) {
-        return APR_ENOMEM;
-    }
-
-    (*new)->pool = pool;
-    (*new)->attr = 0;
-    (*new)->stacksize = 0;
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_threadattr_detach_set(apr_threadattr_t *attr, apr_int32_t on)
-{
-    attr->attr |= APR_THREADATTR_DETACHED;
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_threadattr_detach_get(apr_threadattr_t *attr)
-{
-    return (attr->attr & APR_THREADATTR_DETACHED) ? APR_DETACH : APR_NOTDETACH;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_threadattr_stacksize_set(apr_threadattr_t *attr,
-                                                       apr_size_t stacksize)
-{
-    attr->stacksize = stacksize;
-    return APR_SUCCESS;
-}
-
-
-
-static void apr_thread_begin(void *arg)
-{
-  apr_thread_t *thread = (apr_thread_t *)arg;
-  thread->exitval = thread->func(thread, thread->data);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_create(apr_thread_t **new, apr_threadattr_t *attr, 
-                                            apr_thread_start_t func, void *data, 
-                                            apr_pool_t *pool)
-{
-    apr_status_t stat;
-    apr_thread_t *thread;
- 
-    thread = (apr_thread_t *)apr_palloc(pool, sizeof(apr_thread_t));
-    *new = thread;
-
-    if (thread == NULL) {
-        return APR_ENOMEM;
-    }
-
-    thread->pool = pool;
-    thread->attr = attr;
-    thread->func = func;
-    thread->data = data;
-    stat = apr_pool_create(&thread->pool, pool);
-    
-    if (stat != APR_SUCCESS) {
-        return stat;
-    }
-
-    if (attr == NULL) {
-        stat = apr_threadattr_create(&thread->attr, thread->pool);
-        
-        if (stat != APR_SUCCESS) {
-            return stat;
-        }
-    }
-
-    thread->tid = _beginthread(apr_thread_begin, NULL,
-                               thread->attr->stacksize > 0 ?
-                               thread->attr->stacksize : APR_THREAD_STACKSIZE,
-                               thread);
-        
-    if (thread->tid < 0) {
-        return errno;
-    }
-
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_os_thread_t) apr_os_thread_current()
-{
-    PIB *ppib;
-    TIB *ptib;
-    DosGetInfoBlocks(&ptib, &ppib);
-    return ptib->tib_ptib2->tib2_ultid;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_exit(apr_thread_t *thd, apr_status_t retval)
-{
-    thd->exitval = retval;
-    _endthread();
-    return -1; /* If we get here something's wrong */
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_join(apr_status_t *retval, apr_thread_t *thd)
-{
-    ULONG rc;
-    TID waittid = thd->tid;
-
-    if (thd->attr->attr & APR_THREADATTR_DETACHED)
-        return APR_EINVAL;
-
-    rc = DosWaitThread(&waittid, DCWW_WAIT);
-
-    if (rc == ERROR_INVALID_THREADID)
-        rc = 0; /* Thread had already terminated */
-
-    *retval = thd->exitval;
-    return APR_OS2_STATUS(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_detach(apr_thread_t *thd)
-{
-    thd->attr->attr |= APR_THREADATTR_DETACHED;
-    return APR_SUCCESS;
-}
-
-
-
-void apr_thread_yield()
-{
-    DosSleep(0);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_os_thread_get(apr_os_thread_t **thethd, apr_thread_t *thd)
-{
-    *thethd = &thd->tid;
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_os_thread_put(apr_thread_t **thd, apr_os_thread_t *thethd, 
-                                            apr_pool_t *pool)
-{
-    if ((*thd) == NULL) {
-        (*thd) = (apr_thread_t *)apr_pcalloc(pool, sizeof(apr_thread_t));
-        (*thd)->pool = pool;
-    }
-    (*thd)->tid = *thethd;
-    return APR_SUCCESS;
-}
-
-
-
-int apr_os_thread_equal(apr_os_thread_t tid1, apr_os_thread_t tid2)
-{
-    return tid1 == tid2;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_data_get(void **data, const char *key, apr_thread_t *thread)
-{
-    return apr_pool_userdata_get(data, key, thread->pool);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_data_set(void *data, const char *key,
-                                              apr_status_t (*cleanup) (void *),
-                                              apr_thread_t *thread)
-{
-    return apr_pool_userdata_set(data, key, cleanup, thread->pool);
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(thread)
-
-
-
-static apr_status_t thread_once_cleanup(void *vcontrol)
-{
-    apr_thread_once_t *control = (apr_thread_once_t *)vcontrol;
-
-    if (control->sem) {
-        DosCloseEventSem(control->sem);
-    }
-
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_once_init(apr_thread_once_t **control,
-                                               apr_pool_t *p)
-{
-    ULONG rc;
-    *control = (apr_thread_once_t *)apr_pcalloc(p, sizeof(apr_thread_once_t));
-    rc = DosCreateEventSem(NULL, &(*control)->sem, 0, TRUE);
-    apr_pool_cleanup_register(p, control, thread_once_cleanup, apr_pool_cleanup_null);
-    return APR_FROM_OS_ERROR(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_once(apr_thread_once_t *control, 
-                                          void (*func)(void))
-{
-    if (!control->hit) {
-        ULONG count, rc;
-        rc = DosResetEventSem(control->sem, &count);
-
-        if (rc == 0 && count) {
-            control->hit = 1;
-            func();
-        }
-    }
-
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/threadpriv.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/threadpriv.c
deleted file mode 100644
index 107ec10d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/threadpriv.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_threadproc.h"
-#include "apr_thread_proc.h"
-#include "apr_portable.h"
-#include "apr_general.h"
-#include "apr_errno.h"
-#include "apr_lib.h"
-#include "apr_arch_file_io.h"
-
-APR_DECLARE(apr_status_t) apr_threadkey_private_create(apr_threadkey_t **key,
-                                                       void (*dest)(void *), 
-                                                       apr_pool_t *pool)
-{
-    (*key) = (apr_threadkey_t *)apr_palloc(pool, sizeof(apr_threadkey_t));
-
-    if ((*key) == NULL) {
-        return APR_ENOMEM;
-    }
-
-    (*key)->pool = pool;
-    return APR_OS2_STATUS(DosAllocThreadLocalMemory(1, &((*key)->key)));
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_private_get(void **new, apr_threadkey_t *key)
-{
-    (*new) = (void *)*(key->key);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_private_set(void *priv, apr_threadkey_t *key)
-{
-    *(key->key) = (ULONG)priv;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_private_delete(apr_threadkey_t *key)
-{
-    return APR_OS2_STATUS(DosFreeThreadLocalMemory(key->key));
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_data_get(void **data, const char *key,
-                                                 apr_threadkey_t *threadkey)
-{
-    return apr_pool_userdata_get(data, key, threadkey->pool);
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_data_set(void *data, const char *key,
-                                                 apr_status_t (*cleanup) (void *),
-                                                 apr_threadkey_t *threadkey)
-{
-    return apr_pool_userdata_set(data, key, cleanup, threadkey->pool);
-}
-
-APR_DECLARE(apr_status_t) apr_os_threadkey_get(apr_os_threadkey_t *thekey, apr_threadkey_t *key)
-{
-    *thekey = key->key;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_threadkey_put(apr_threadkey_t **key, 
-                                               apr_os_threadkey_t *thekey, 
-                                               apr_pool_t *pool)
-{
-    if (pool == NULL) {
-        return APR_ENOPOOL;
-    }
-    if ((*key) == NULL) {
-        (*key) = (apr_threadkey_t *)apr_pcalloc(pool, sizeof(apr_threadkey_t));
-        (*key)->pool = pool;
-    }
-    (*key)->key = *thekey;
-    return APR_SUCCESS;
-}