Use libc's strndup() instead of Dtrace's reimplementation.
Corresponds partially to OpenSolaris change: PSARC 2010/299 GNU/Linux/BSD compatibility functions 6901783 strndup would be nice MFC after: 2 weeks
This commit is contained in:
parent
989006abe5
commit
ba73774268
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=238509
@ -29,23 +29,6 @@
|
||||
#include <ctype.h>
|
||||
|
||||
#include <dt_string.h>
|
||||
#include <dt_impl.h>
|
||||
|
||||
/*
|
||||
* Create a copy of string s, but only duplicate the first n bytes.
|
||||
*/
|
||||
char *
|
||||
strndup(const char *s, size_t n)
|
||||
{
|
||||
char *s2 = malloc(n + 1);
|
||||
|
||||
if (s2 == NULL)
|
||||
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
|
||||
|
||||
(void) strncpy(s2, s, n);
|
||||
s2[n] = '\0';
|
||||
return (s2);
|
||||
}
|
||||
|
||||
/*
|
||||
* Transform string s inline, converting each embedded C escape sequence string
|
||||
|
@ -2,9 +2,8 @@
|
||||
* CDDL HEADER START
|
||||
*
|
||||
* The contents of this file are subject to the terms of the
|
||||
* Common Development and Distribution License, Version 1.0 only
|
||||
* (the "License"). You may not use this file except in compliance
|
||||
* with the License.
|
||||
* Common Development and Distribution License (the "License").
|
||||
* You may not use this file except in compliance with the License.
|
||||
*
|
||||
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
||||
* or http://www.opensolaris.org/os/licensing.
|
||||
@ -20,14 +19,12 @@
|
||||
* CDDL HEADER END
|
||||
*/
|
||||
/*
|
||||
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
|
||||
* Use is subject to license terms.
|
||||
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
*/
|
||||
|
||||
#ifndef _DT_STRING_H
|
||||
#define _DT_STRING_H
|
||||
|
||||
#pragma ident "%Z%%M% %I% %E% SMI"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <strings.h>
|
||||
@ -36,7 +33,6 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
extern char *strndup(const char *, size_t);
|
||||
extern size_t stresc2chr(char *);
|
||||
extern char *strchr2esc(const char *, size_t);
|
||||
extern const char *strbasename(const char *);
|
||||
|
Loading…
Reference in New Issue
Block a user