Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6763 → Rev 6764

/programs/fs/unzip60/kolibri/Makefile.gcc
20,7 → 20,9
NOASM=1
CC_CPU_OPT=-march=pentium
#USEZLIB=1
#DEBUG=1
 
 
### Optional section
 
# The following options allow to override the default assembler code usage
127,9 → 129,9
LD_WARN_OPT =
 
# Debug version
CC_DEBUG_OPT = -g
CC_DEBUG_OPT = -g -DDEBUG
AS_DEBUG_OPT = $(CC_DEBUG_OPT)
LD_DEBUG_OPT = $(CC_DEBUG_OPT)
LD_DEBUG_OPT = -g
 
# Release version
CC_RELEASE_OPT =
/programs/fs/unzip60/kolibri/Makefile.gcc.static
103,7 → 103,7
LIBPATH = -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/mingw32/lib
 
CC_ENVIR_OPT = -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -DKOS32 \
$(INCLUDES) -DSTATIC_LIBC
$(INCLUDES) -DSTATIC_LIBC -DBUILD_LIBC
 
### Compiler-specific section
 
/programs/fs/unzip60/kolibri/config.h
13,9 → 13,6
#include <unistd.h>
#include <dirent.h>
 
// moved to makefile, in kilibri leads to bug EMFILES
//#define DEBUG
 
#define DIR_END '/'
#define NO_STRNICMP
#define STRNICMP zstrnicmp
27,6 → 24,9
#define getch() getchar() /* not correct, but may not be on a console */
#define HAVE_WORKING_GETCH
 
#define UNICODE_SUPPORT
#define UTF8_MAYBE_NATIVE
#define NO_NL_LANGINFO
/*
# ifdef DATE_FORMAT
# undef DATE_FORMAT
/programs/fs/unzip60/kolibri/kos32.c
154,6 → 154,8
else
++cp; /* point to start of last component of path */
 
fprintf(stderr, "mapname start[%s]\n", cp);
 
/*---------------------------------------------------------------------------
Begin main loop through characters in filename.
---------------------------------------------------------------------------*/
180,7 → 182,7
lastsemi = (char *)NULL; /* leave direct. semi-colons alone */
break;
 
#ifdef __CYGWIN__ /* Cygwin runs on Win32, apply FAT/NTFS filename rules */
#ifdef KOS32 /* Cygwin runs on Win32, apply FAT/NTFS filename rules */
case ':': /* drive spec not stored, so no colon allowed */
case '\\': /* '\\' may come as normal filename char (not */
case '<': /* dir sep char!) from unix-like file system */
205,7 → 207,7
break; /* later, if requested */
#endif
 
#ifdef MTS
#ifdef KOS32
case ' ': /* change spaces to underscore under */
*pp++ = '_'; /* MTS; leave as spaces under Unix */
break;
217,11 → 219,6
*/
if ((isprint(workch) || (128 <= workch && workch <= 254)))
*pp++ = (char)workch;
/*kos
if (uO.cflxflag ||
(isprint(workch) || (128 <= workch && workch <= 254)))
*pp++ = (char)workch;
*/
} /* end switch */
 
} /* end while loop */
326,6 → 323,9
checkdir(__G__ pathcomp, APPEND_NAME); /* returns 1 if truncated: care? */
checkdir(__G__ G.filename, GETPATH);
 
fprintf(stderr, "mapname end[%s]\n", pathcomp);
 
 
return error;
 
} /* end function mapname() */
467,6 → 467,12
---------------------------------------------------------------------------*/
 
if (FUNCTION == GETPATH) {
if(G.native_is_utf8)
{
pathcomp[0] = 3; // kolibri utf8 flag
strcpy(pathcomp + 1, G.buildpath);
}
else
strcpy(pathcomp, G.buildpath);
Trace((stderr, "getting and freeing path [%s]\n",
FnFilter1(pathcomp)));
/programs/fs/unzip60/unzip.c
790,6 → 790,10
* UnZip maintainer, a successful switch to "en-US.UTF-8"
* resulted in garbage display of all non-basic ASCII characters.
*/
#ifdef KOS32
/* manual override */
G.native_is_utf8 = TRUE;
#endif
}
# endif /* UTF8_MAYBE_NATIVE */