mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-04-23 03:00:37 +02:00
util: implement strndup for WIN32
v2: - Add strndup.h to Makefile.sources (Emil) - Use calloc instead of malloc (Emil). - Check if allocation fails (Emil, Jose) - Add '#pragma once' and include stdlib.h to strndup.h (Jose) Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92124 Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
This commit is contained in:
parent
7efb235019
commit
bea66d22f2
4 changed files with 84 additions and 0 deletions
|
|
@ -37,6 +37,7 @@
|
|||
#include "../glsl/program.h"
|
||||
#include "uniforms.h"
|
||||
#include "main/enums.h"
|
||||
#include "util/strndup.h"
|
||||
|
||||
extern "C" {
|
||||
#include "shaderapi.h"
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@ MESA_UTIL_FILES := \
|
|||
set.c \
|
||||
set.h \
|
||||
simple_list.h \
|
||||
strndup.c \
|
||||
strndup.h \
|
||||
strtod.c \
|
||||
strtod.h \
|
||||
texcompress_rgtc_tmp.h \
|
||||
|
|
|
|||
49
src/util/strndup.c
Normal file
49
src/util/strndup.c
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
/*
|
||||
* Copyright (c) 2015 Intel Corporation
|
||||
*
|
||||
* 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 (including the next
|
||||
* paragraph) 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.
|
||||
*/
|
||||
|
||||
#if defined(_WIN32)
|
||||
#include <stdlib.h>
|
||||
#include "strndup.h"
|
||||
|
||||
char *
|
||||
strndup(const char *str, size_t max)
|
||||
{
|
||||
size_t n;
|
||||
char *ptr;
|
||||
|
||||
if (!str)
|
||||
return NULL;
|
||||
|
||||
n = strlen(str);
|
||||
if (n > max)
|
||||
n = max;
|
||||
|
||||
ptr = (char *) calloc(n + 1, sizeof(char));
|
||||
if (!ptr)
|
||||
return NULL;
|
||||
|
||||
memcpy(ptr, str, n);
|
||||
return ptr;
|
||||
}
|
||||
|
||||
#endif
|
||||
32
src/util/strndup.h
Normal file
32
src/util/strndup.h
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
/*
|
||||
* Copyright (c) 2015 Intel Corporation
|
||||
*
|
||||
* 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 (including the next
|
||||
* paragraph) 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.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <stdlib.h> // size_t
|
||||
|
||||
#if defined(_WIN32)
|
||||
|
||||
extern char *strndup(const char *str, size_t max);
|
||||
|
||||
#endif
|
||||
Loading…
Add table
Reference in a new issue