From cvs-return-5979-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org Mon Jul 05 07:39:19 2004 Return-Path: Delivered-To: apmail-apr-cvs-archive@www.apache.org Received: (qmail 84495 invoked from network); 5 Jul 2004 07:39:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 5 Jul 2004 07:39:19 -0000 Received: (qmail 81481 invoked by uid 500); 5 Jul 2004 07:38:54 -0000 Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 81293 invoked by uid 500); 5 Jul 2004 07:38:51 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 81134 invoked by uid 99); 5 Jul 2004 07:38:48 -0000 X-ASF-Spam-Status: No, hits=0.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Date: 5 Jul 2004 07:38:39 -0000 Message-ID: <20040705073839.84155.qmail@minotaur.apache.org> From: martin@apache.org To: apr-cvs@apache.org Subject: cvs commit: apr/build jlibtool.c X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N martin 2004/07/05 00:38:39 Modified: build jlibtool.c Log: Update the license, plus minor portability changes Revision Changes Path 1.4 +28 -65 apr/build/jlibtool.c Index: jlibtool.c =================================================================== RCS file: /home/cvs/apr/build/jlibtool.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -u -r1.3 -r1.4 --- jlibtool.c 29 Jun 2004 15:25:56 -0000 1.3 +++ jlibtool.c 5 Jul 2004 07:38:38 -0000 1.4 @@ -1,61 +1,19 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 +/* Copyright 2000-2004 The Apache Software Foundation * - * Copyright (c) 2000-2002 The Apache Software Foundation. All rights - * reserved. + * Licensed 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 * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * http://www.apache.org/licenses/LICENSE-2.0 * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . + * 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 -#if defined(_OSD_POSIX) -#include -#endif #include #include #include @@ -136,12 +94,17 @@ # define LIBRARIAN_OPTS "cr" # define DYNAMIC_LINK_OPTS "-G" # define LINKER_FLAG_PREFIX "-Wl," +# define NEED_SNPRINTF #endif #ifndef SHELL_CMD #error Unsupported platform: Please add defines for SHELL_CMD etc. for your platform. #endif +#ifdef NEED_SNPRINTF +#include +#endif + #ifdef __EMX__ #include #endif @@ -172,9 +135,9 @@ }; enum pic_mode_e { - UNKNOWN, - PREFER, - AVOID, + pic_UNKNOWN, + pic_PREFER, + pic_AVOID, }; typedef struct { @@ -232,7 +195,7 @@ const char *version_info; } command_t; -#if defined(_OSD_POSIX) +#if defined(NEED_SNPRINTF) /* Write at most n characters to the buffer in str, return the * number of chars written or -1 if the buffer would have been * overflowed. @@ -493,12 +456,12 @@ } if (strcmp(arg, "prefer-pic") == 0) { - cmd_data->options.pic_mode = PREFER; + cmd_data->options.pic_mode = pic_PREFER; return 1; } if (strcmp(arg, "prefer-non-pic") == 0) { - cmd_data->options.pic_mode = AVOID; + cmd_data->options.pic_mode = pic_AVOID; return 1; } @@ -696,7 +659,7 @@ if (rv == 0) { if (pass == 1) { - cmd->options.pic_mode = AVOID; + cmd->options.pic_mode = pic_AVOID; } return newarg; } @@ -734,7 +697,7 @@ switch (pass) { case 0: - if (cmd->options.pic_mode != AVOID || cmd->options.shared) { + if (cmd->options.pic_mode != pic_AVOID || cmd->options.shared) { strcpy(ext, DYNAMIC_LIB_EXT); break; } @@ -913,7 +876,7 @@ cmd_data->basename = arg; cmd_data->output = otProgram; #if defined(_OSD_POSIX) - cmd_data->options.pic_mode = AVOID; + cmd_data->options.pic_mode = pic_AVOID; #endif newarg = (char *)malloc(strlen(arg) + 5); strcpy(newarg, arg); @@ -1228,7 +1191,7 @@ append_count_chars(c->arglist, c->obj_files); append_count_chars(c->arglist, c->shared_opts.dependencies); #ifdef DYNAMIC_LINK_OPTS - if (c->options.pic_mode != AVOID) { + if (c->options.pic_mode != pic_AVOID) { push_count_chars(c->arglist, DYNAMIC_LINK_OPTS); } #endif @@ -1242,7 +1205,7 @@ { case mCompile: #ifdef PIC_FLAG - if (cmd_data->options.pic_mode != AVOID) { + if (cmd_data->options.pic_mode != pic_AVOID) { push_count_chars(cmd_data->arglist, PIC_FLAG); } #endif @@ -1413,7 +1376,7 @@ #endif } #ifdef DYNAMIC_LINK_OPTS - if (cmd_data->options.pic_mode != AVOID) { + if (cmd_data->options.pic_mode != pic_AVOID) { push_count_chars(cmd_data->program_opts, DYNAMIC_LINK_OPTS); } @@ -1491,7 +1454,7 @@ memset(&cmd_data, 0, sizeof(cmd_data)); - cmd_data.options.pic_mode = UNKNOWN; + cmd_data.options.pic_mode = pic_UNKNOWN; cmd_data.program_opts = (count_chars*)malloc(sizeof(count_chars)); init_count_chars(cmd_data.program_opts);