pegasus/src/Executor/Strlcat.h - diff

Return to Strlcat.h CVS log

Up to [Pegasus] / pegasus / src / Executor

Diff for /pegasus/src/Executor/Strlcat.h between version 1.1 and 1.2

version 1.1, 2007/01/04 01:09:44

version 1.2, 2007/05/25 18:35:07

Line 0

Line 1

//%2006////////////////////////////////////////////////////////////////////////

// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.

// IBM Corp.; EMC Corporation, The Open Group.

// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

// EMC Corporation; VERITAS Software Corporation; The Open Group.

// EMC Corporation; Symantec Corporation; The Open Group.

// 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 _Executor_Strlcat_h

#define _Executor_Strlcat_h

#include <stdlib.h>

**==============================================================================

** Strlcat()

** This is an original implementation of the strlcat() function as described

** by Todd C. Miller in his popular security paper entitled "strlcpy and

** strlcat - consistent, safe, string copy and concatenation".

** Note that this implementation favors readability over efficiency. More

** efficient implementations are possible but would be too complicated

** to verify in a security audit.

**==============================================================================

static size_t Strlcat(char* dest, const char* src, size_t size)

{

size_t i;

size_t j;

/* Find dest null terminator. */

for (i = 0; i < size && dest[i]; i++)

;

/* If no-null terminator found, return size. */

if (i == size)

return size;

/* Copy src characters to dest. */

for (j = 0; src[j] && i + 1 < size; i++, j++)

dest[i] = src[j];

/* Null terminate size non-zero. */

if (size > 0)

dest[i] = '\0';

while (src[j])

{

j++;

i++;

}

return i;

}

#endif /* _Executor_Strlcat_h */

Legend:

Removed from v.1.1
changed lines
	Added in v.1.2

No CVS admin address has been configured