tyler.durden/Win32-OpenSSH
1
0
Fork 0
mirror of https://github.com/PowerShell/Win32-OpenSSH.git synced 2025-07-22 21:45:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

cleaning up strcasecmp

Browse Source
This commit is contained in:
Manoj Ampalam 2016-10-26 15:07:46 -07:00
parent 54c90f1072
commit 36f6ba825d
5 changed files with 8 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/win32/openssh/win32compat.vcxproj
View File

@ -149,7 +149,6 @@
<ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\daemon.c" /> <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\daemon.c" />
<ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\kerberos.c" /> <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\kerberos.c" />
<ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\startupneeds.c" /> <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\startupneeds.c" />
<ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\strcasecmp.c" />
<ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\tncon.c" /> <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\tncon.c" />
<ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\tnnet.c" /> <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\tnnet.c" />
<ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\win32auth.c" /> <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\win32auth.c" />

3
contrib/win32/openssh/win32compat.vcxproj.filters
View File

@ -51,9 +51,6 @@
<ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\startupneeds.c"> <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\startupneeds.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\strcasecmp.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\tncon.c"> <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\tncon.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>

20
contrib/win32/win32compat/inc/unistd.h
View File

@ -27,26 +27,6 @@
#define getdtablesize() MAX_FDS #define getdtablesize() MAX_FDS
#define gethostname w32_gethostname #define gethostname w32_gethostname
#define fopen w32_fopen_utf8
int daemon(int nochdir, int noclose); int daemon(int nochdir, int noclose);
/* Compatibility header to avoid lots of #ifdefs in includes.h on Win32 */
#include <conio.h>
/* We can't put these in string.h since we can't easily override that header, so here they are */
#if !defined(HAVE_STRCASECMP) && !defined(__MINGW32__)
size_t strcasecmp(const char *left, const char *right);
#endif
#if !defined(HAVE_STRNCASECMP) && !defined(__MINGW32__)
size_t strncasecmp(const char *left, const char *right, size_t n);
#endif
#define popen _popen
#define pclose _pclose
/* End of prototypes in the wrong file */
#endif #endif

8
contrib/win32/win32compat/inc/w32posix.h
View File

@ -163,3 +163,11 @@ struct iovec
void void
explicit_bzero(void *b, size_t len); explicit_bzero(void *b, size_t len);
/* string.h overrides */
#define strcasecmp _stricmp
#define strncasecmp _strnicmp
/* stdio.h overrides */
#define fopen w32_fopen_utf8
#define popen _popen
#define pclose _pclose

103
contrib/win32/win32compat/strcasecmp.c
View File

@ -1,103 +0,0 @@
/*
* Author: NoMachine <developers@nomachine.com>
*
* Copyright (c) 2009, 2010 NoMachine
* All rights reserved
*
* Support functions and system calls' replacements needed to let the
* software run on Win32 based operating systems.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 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.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS 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 AUTHOR 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.
*/
/* Similar to strcasecmp.c from OpenBSD */
/* Note: This could be moved to the OpenBSD-Compat layer in OpenSSH and added to config.h etc. */
#include "includes.h"
#if !defined(HAVE_STRCASECMP) || !defined(HAVE_STRNCASECMP)
#include <sys/types.h>
#include <string.h>
#endif
#ifndef HAVE_STRCASECMP
size_t strcasecmp(const char *left, const char *right)
{
#if 0
const unsigned char *uleft = (const unsigned char *) left, *uright = (const unsigned char *) right;
while (tolower(*uleft) == tolower(*uright))
{
if (*uleft++ == '\0')
{
return (0);
}
uright++;
}
return (tolower(*uleft) - tolower(*uright));
#else
return stricmp(left, right);
#endif
}
#endif
#ifndef HAVE_STRNCASECMP
size_t strncasecmp(const char *left, const char *right, size_t n)
{
#if 0
if (n != 0)
{
const unsigned char *uleft = (const unsigned char *) left, *uright = (const unsigned char *) right;
do
{
if (tolower(*uleft) != tolower(*uright))
{
return (tolower(*uleft) - tolower(*uright));
}
if (*uleft++ == '\0')
{
break;
}
uright++;
}
while (--n != 0);
}
return (0);
#else
return strnicmp(left, right, n);
#endif
}
#endif