diff --git a/reactos/tools/winebuild/Makefile b/reactos/tools/winebuild/Makefile index 84ce9ccf49a..27025f13827 100644 --- a/reactos/tools/winebuild/Makefile +++ b/reactos/tools/winebuild/Makefile @@ -15,7 +15,8 @@ OBJECTS = \ res16.o \ res32.o \ spec32.o \ - utils.o + utils.o \ + mkstemps.o CLEAN_FILES = *.o $(TARGET) diff --git a/reactos/tools/winebuild/import.c b/reactos/tools/winebuild/import.c index f1aa28f8312..7a9d8c241f2 100644 --- a/reactos/tools/winebuild/import.c +++ b/reactos/tools/winebuild/import.c @@ -32,6 +32,8 @@ #if defined(WIN32) #include +#else +#include #endif #include "build.h" @@ -651,7 +653,7 @@ static const char *ldcombine_files( char **argv ) #else if (output_file_name && output_file_name[0]) { - ld_tmp_file = xmalloc( MAX_PATH); + ld_tmp_file = xmalloc( PATH_MAX ); strcpy( ld_tmp_file, output_file_name ); strcat( ld_tmp_file, ".XXXXXX.o" ); } diff --git a/reactos/tools/winebuild/main.c b/reactos/tools/winebuild/main.c index 5b1d769b206..4596d6756dd 100644 --- a/reactos/tools/winebuild/main.c +++ b/reactos/tools/winebuild/main.c @@ -388,7 +388,7 @@ int main(int argc, char **argv) switch (SpecType) { case SPEC_WIN16: -#if defined(WIN32) +#if defined(__REACTOS__) fatal_error( "Win16 specs are not supported in ReactOS version of winebuild\n" ); #else if (argv[0]) @@ -419,7 +419,7 @@ int main(int argc, char **argv) BuildDebugFile( output_file, current_src_dir, argv ); break; case MODE_RELAY16: -#if defined(WIN32) +#if defined(__REACTOS__) fatal_error( "Win16 relays are not supported in ReactOS version of winebuild\n" ); #else if (argv[0]) fatal_error( "file argument '%s' not allowed in this mode\n", argv[0] ); @@ -427,7 +427,7 @@ int main(int argc, char **argv) #endif break; case MODE_RELAY32: -#if defined(WIN32) +#if defined(__REACTOS__) fatal_error( "Win32 relays are not supported in ReactOS version of winebuild\n" ); #else if (argv[0]) fatal_error( "file argument '%s' not allowed in this mode\n", argv[0] ); diff --git a/reactos/tools/winebuild/mkstemps.c b/reactos/tools/winebuild/mkstemps.c new file mode 100644 index 00000000000..ccf212c871d --- /dev/null +++ b/reactos/tools/winebuild/mkstemps.c @@ -0,0 +1,139 @@ +/* Copyright (C) 1991, 1992, 1996, 1998 Free Software Foundation, Inc. + This file is derived from mkstemp.c from the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include "config.h" +#include "wine/port.h" + +#include +#include +#include +#include +#include +#include +#ifdef HAVE_UNISTD_H +#include +#endif +#ifdef HAVE_SYS_TIME_H +#include +#endif +#ifdef HAVE_PROCESS_H +#include +#endif + +/* We need to provide a type for gcc_uint64_t. */ +#ifdef __GNUC__ +__extension__ typedef unsigned long long gcc_uint64_t; +#else +typedef unsigned long gcc_uint64_t; +#endif + +#ifndef TMP_MAX +#define TMP_MAX 16384 +#endif + +/* + +@deftypefn Replacement int mkstemps (char *@var{template}, int @var{suffix_len}) + +Generate a unique temporary file name from @var{template}. +@var{template} has the form: + +@example + @var{path}/ccXXXXXX@var{suffix} +@end example + +@var{suffix_len} tells us how long @var{suffix} is (it can be zero +length). The last six characters of @var{template} before @var{suffix} +must be @samp{XXXXXX}; they are replaced with a string that makes the +filename unique. Returns a file descriptor open on the file for +reading and writing. + +@end deftypefn + +*/ + +int +mkstemps ( + char *template, + int suffix_len) +{ + static const char letters[] + = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; + static gcc_uint64_t value; +#ifdef HAVE_GETTIMEOFDAY + struct timeval tv; +#endif + char *XXXXXX; + size_t len; + int count; + + len = strlen (template); + + if ((int) len < 6 + suffix_len + || strncmp (&template[len - 6 - suffix_len], "XXXXXX", 6)) + { + return -1; + } + + XXXXXX = &template[len - 6 - suffix_len]; + +#ifdef HAVE_GETTIMEOFDAY + /* Get some more or less random data. */ + gettimeofday (&tv, NULL); + value += ((gcc_uint64_t) tv.tv_usec << 16) ^ tv.tv_sec ^ getpid (); +#else + value += getpid (); +#endif + + for (count = 0; count < TMP_MAX; ++count) + { + gcc_uint64_t v = value; + int fd; + + /* Fill in the random bits. */ + XXXXXX[0] = letters[v % 62]; + v /= 62; + XXXXXX[1] = letters[v % 62]; + v /= 62; + XXXXXX[2] = letters[v % 62]; + v /= 62; + XXXXXX[3] = letters[v % 62]; + v /= 62; + XXXXXX[4] = letters[v % 62]; + v /= 62; + XXXXXX[5] = letters[v % 62]; + +#ifdef VMS + fd = open (template, O_RDWR|O_CREAT|O_EXCL, 0600, "fop=tmd"); +#else + fd = open (template, O_RDWR|O_CREAT|O_EXCL, 0600); +#endif + if (fd >= 0) + /* The file does not exist. */ + return fd; + + /* This is a random value. It is only necessary that the next + TMP_MAX values generated by adding 7777 to VALUE are different + with (module 2^32). */ + value += 7777; + } + + /* We return the null string if we can't find a unique file name. */ + template[0] = '\0'; + return -1; +} diff --git a/reactos/tools/winebuild/utils.c b/reactos/tools/winebuild/utils.c index 2736ba0d6cc..4fa4f0f57d6 100644 --- a/reactos/tools/winebuild/utils.c +++ b/reactos/tools/winebuild/utils.c @@ -21,6 +21,10 @@ #include "config.h" #include "wine/port.h" +#if !defined(WIN32) +#undef strdup +#endif + #include #include #include