Move winpty_wcsnlen to shared

This commit is contained in:
Ryan Prichard 2015-10-21 19:31:30 -05:00
parent 3575c55c8c
commit 6310ebb2c8
5 changed files with 65 additions and 25 deletions

View File

@ -32,7 +32,7 @@
#include "../shared/DebugClient.h"
#include "../shared/OsModule.h"
#include "../shared/WinptyAssert.h"
#include "winpty_wcsnlen.h"
#include "../shared/winpty_wcsnlen.h"
namespace {

View File

@ -1,15 +0,0 @@
#include "winpty_wcsnlen.h"
#include "../shared/WinptyAssert.h"
// Workaround. MinGW (from mingw.org) does not have wcsnlen. MinGW-w64 *does*
// have wcsnlen, but use this function for consistency.
size_t winpty_wcsnlen(const wchar_t *s, size_t maxlen) {
ASSERT(s != NULL);
for (size_t i = 0; i < maxlen; ++i) {
if (s[i] == L'\0') {
return i;
}
}
return maxlen;
}

View File

@ -1,9 +0,0 @@
#ifndef WINPTY_WCSNLEN_H
#define WINPTY_WCSNLEN_H
#include <stdlib.h>
#include <wchar.h>
size_t winpty_wcsnlen(const wchar_t *s, size_t maxlen);
#endif // WINPTY_WCSNLEN_H

35
shared/winpty_wcsnlen.cc Normal file
View File

@ -0,0 +1,35 @@
// Copyright (c) 2015 Ryan Prichard
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to
// deal in the Software without restriction, including without limitation the
// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
// sell copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
#include "winpty_wcsnlen.h"
#include "WinptyAssert.h"
// Workaround. MinGW (from mingw.org) does not have wcsnlen. MinGW-w64 *does*
// have wcsnlen, but use this function for consistency.
size_t winpty_wcsnlen(const wchar_t *s, size_t maxlen) {
ASSERT(s != NULL);
for (size_t i = 0; i < maxlen; ++i) {
if (s[i] == L'\0') {
return i;
}
}
return maxlen;
}

29
shared/winpty_wcsnlen.h Normal file
View File

@ -0,0 +1,29 @@
// Copyright (c) 2015 Ryan Prichard
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to
// deal in the Software without restriction, including without limitation the
// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
// sell copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
#ifndef WINPTY_WCSNLEN_H
#define WINPTY_WCSNLEN_H
#include <stdlib.h>
#include <wchar.h>
size_t winpty_wcsnlen(const wchar_t *s, size_t maxlen);
#endif // WINPTY_WCSNLEN_H