mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-07-28 05:20:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove plenty of makefile misconfigurations

Browse source
This commit is contained in:
Justine Tunney 2022-07-21 09:16:38 -07:00
parent 9172fd42a0
commit 8b469389f6
186 changed files with 1408 additions and 901 deletions
Download patch file Download diff file Expand all files Collapse all files

11
third_party/zip/crypt.c vendored
View file

@ -1,4 +1,9 @@
/* clang-format off */
#define ZCRYPT_INTERNAL
#include "third_party/zip/zip.h"
#include "third_party/zip/crypt.h"
#include "third_party/zip/ttyio.h"
#include "libc/rand/rand.h"
/*
Copyright (c) 1990-2008 Info-ZIP. All rights reserved.
@ -30,12 +35,6 @@
version without encryption capabilities).
*/
#define ZCRYPT_INTERNAL
#include "third_party/zip/zip.h"
#include "third_party/zip/crypt.h"
#include "third_party/zip/ttyio.h"
#include "libc/rand/rand.h"
#if CRYPT
#ifndef FALSE

2
third_party/zip/crypt_.c vendored Normal file
View file

@ -0,0 +1,2 @@
#define UTIL
#include "third_party/zip/crypt.c"

2
third_party/zip/fileio_.c vendored Normal file
View file

@ -0,0 +1,2 @@
#define UTIL
#include "third_party/zip/fileio.c"

19
third_party/zip/unix.c vendored
View file

@ -1,4 +1,14 @@
/* clang-format off */
#include "libc/calls/struct/dirent.h"
#include "libc/calls/calls.h"
#include "libc/sysv/consts/s.h"
#include "third_party/zip/zip.h"
#include "libc/time/time.h"
#include "libc/calls/struct/stat.macros.h"
#include "libc/calls/calls.h"
#include "third_party/zip/osdep.h"
#include "libc/sysv/consts/dt.h"
/*
unix/unix.c - Zip 3
@ -9,15 +19,6 @@
If, for some reason, all these files are missing, the Info-ZIP license
also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html
*/
#include "libc/calls/struct/dirent.h"
#include "libc/calls/calls.h"
#include "libc/sysv/consts/s.h"
#include "third_party/zip/zip.h"
#include "libc/time/time.h"
#include "libc/calls/struct/stat.macros.h"
#include "libc/calls/calls.h"
#include "third_party/zip/osdep.h"
#include "libc/sysv/consts/dt.h"
#ifndef UTIL /* the companion #endif is a bit of ways down ... */

2
third_party/zip/unix_.c vendored Normal file
View file

@ -0,0 +1,2 @@
#define UTIL
#include "third_party/zip/unix.c"

2
third_party/zip/util_.c vendored Normal file
View file

@ -0,0 +1,2 @@
#define UTIL
#include "third_party/zip/util.c"

90
third_party/zip/zip.h vendored
View file

@ -1,81 +1,6 @@
/* clang-format off */
/*
zip.h - Zip 3
/---------------------------------------------------------------------/
Info-ZIP Licence
This is version 2007-Mar-4 of the Info-ZIP license.
The definitive version of this document should be available at
ftp://ftp.info-zip.org/pub/infozip/license.html indefinitely and
a copy at http://www.info-zip.org/pub/infozip/license.html.
Copyright (c) 1990-2008 Info-ZIP. All rights reserved.
For the purposes of this copyright and license, "Info-ZIP" is defined as
the following set of individuals:
Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois,
Jean-loup Gailly, Hunter Goatley, Ed Gordon, Ian Gorman, Chris Herborth,
Dirk Haase, Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz,
David Kirschbaum, Johnny Lee, Onno van der Linden, Igor Mandrichenko,
Steve P. Miller, Sergio Monesi, Keith Owens, George Petrov, Greg Roelofs,
Kai Uwe Rommel, Steve Salisbury, Dave Smith, Steven M. Schweda,
Christian Spieler, Cosmin Truta, Antoine Verheijen, Paul von Behren,
Rich Wales, Mike White.
This software is provided "as is," without warranty of any kind, express
or implied. In no event shall Info-ZIP or its contributors be held liable
for any direct, indirect, incidental, special or consequential damages
arising out of the use of or inability to use this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the above disclaimer and the following restrictions:
1. Redistributions of source code (in whole or in part) must retain
the above copyright notice, definition, disclaimer, and this list
of conditions.
2. Redistributions in binary form (compiled executables and libraries)
must reproduce the above copyright notice, definition, disclaimer,
and this list of conditions in documentation and/or other materials
provided with the distribution. The sole exception to this condition
is redistribution of a standard UnZipSFX binary (including SFXWiz) as
part of a self-extracting archive; that is permitted without inclusion
of this license, as long as the normal SFX banner has not been removed
from the binary or disabled.
3. Altered versions--including, but not limited to, ports to new operating
systems, existing ports with new graphical interfaces, versions with
modified or added functionality, and dynamic, shared, or static library
versions not from Info-ZIP--must be plainly marked as such and must not
be misrepresented as being the original source or, if binaries,
compiled from the original source. Such altered versions also must not
be misrepresented as being Info-ZIP releases--including, but not
limited to, labeling of the altered versions with the names "Info-ZIP"
(or any variation thereof, including, but not limited to, different
capitalizations), "Pocket UnZip," "WiZ" or "MacZip" without the
explicit permission of Info-ZIP. Such altered versions are further
prohibited from misrepresentative use of the Zip-Bugs or Info-ZIP
e-mail addresses or the Info-ZIP URL(s), such as to imply Info-ZIP
will provide support for the altered versions.
4. Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip,"
"UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its
own source and binary releases.
/---------------------------------------------------------------------/
*/
/*
* zip.h by Mark Adler
*/
#ifndef __zip_h
#define __zip_h 1
/* clang-format off */
#define ZIP /* for crypt.c: include zip password functions, not unzip */
@ -88,6 +13,9 @@ typedef unsigned long ulg; /* unsigned 32-bit value */
/* Set up portability */
#include "third_party/zip/tailor.h"
/* Error return codes and PERR macro */
#include "third_party/zip/ziperr.h"
/* In the utilities, the crc32() function is only used for UNICODE_SUPPORT. */
#if defined(UTIL) && !defined(UNICODE_SUPPORT)
# define CRC_TABLE_ONLY
@ -273,9 +201,6 @@ struct plist {
#define ZP_PW_ENTER 0 /* request for encryption password */
#define ZP_PW_VERIFY 1 /* request for reentering password */
/* Error return codes and PERR macro */
#include "third_party/zip/ziperr.h"
#if 0 /* Optimization: use the (const) result of crc32(0L,NULL,0) */
# define CRCVAL_INITIAL crc32(0L, (uch *)NULL, 0)
# if 00 /* not used, should be removed !! */
@ -870,13 +795,6 @@ void bi_init OF((char *, unsigned int, int));
# endif
#endif /* WIN32 */
#if (defined(WINDLL) || defined(DLL_ZIPAPI))
/*---------------------------------------------------------------------------
Prototypes for public Zip API (DLL) functions.
---------------------------------------------------------------------------*/
#include "third_party/zip/api.h"
#endif /* WINDLL || DLL_ZIPAPI */
/* WIN32_OEM */
#ifdef WIN32

15
third_party/zip/zip.mk vendored
View file

@ -5,7 +5,7 @@ PKGS += THIRD_PARTY_ZIP
THIRD_PARTY_ZIP_FILES := $(wildcard third_party/zip/*)
THIRD_PARTY_ZIP_SRCS = $(filter %.c,$(THIRD_PARTY_ZIP_FILES))
#THIRD_PARTY_ZIP_HDRS = $(filter %.h,$(THIRD_PARTY_ZIP_FILES))
THIRD_PARTY_ZIP_HDRS = $(filter %.h,$(THIRD_PARTY_ZIP_FILES))
THIRD_PARTY_ZIP_INCS = $(filter %.inc,$(THIRD_PARTY_ZIP_FILES))
THIRD_PARTY_ZIP_COMS = \
@ -163,14 +163,6 @@ o/$(MODE)/third_party/zip/zipup.o: \
-DZIP64_SUPPORT \
-DBZIP2_SUPPORT
o/$(MODE)/third_party/zip/crypt_.o \
o/$(MODE)/third_party/zip/unix_.o \
o/$(MODE)/third_party/zip/zipfile_.o \
o/$(MODE)/third_party/zip/fileio_.o \
o/$(MODE)/third_party/zip/util_.o: \
OVERRIDE_CPPFLAGS += \
-DUTIL
o/$(MODE)/third_party/zip/zip.o \
o/$(MODE)/third_party/zip/zipsplit.o \
o/$(MODE)/third_party/zip/fileio.o \
@ -178,11 +170,6 @@ o/$(MODE)/third_party/zip/fileio_.o: \
OVERRIDE_CPPFLAGS += \
-DSTACK_FRAME_UNLIMITED
o/$(MODE)/third_party/zip/%_.o: \
third_party/zip/%.c \
o/$(MODE)/third_party/zip/%.o
@$(COMPILE) -AOBJECTIFY.c $(OBJECTIFY.c) $(OUTPUT_OPTION) $<
.PHONY: o/$(MODE)/third_party/zip
o/$(MODE)/third_party/zip: \
$(THIRD_PARTY_ZIP_BINS) \

2
third_party/zip/zipfile_.c vendored Normal file
View file

@ -0,0 +1,2 @@
#define UTIL
#include "third_party/zip/zipfile.c"