mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-11-22 11:14:18 +01:00
d9a9f23d0b
This adds support for two new diff algorithms, Myers diff and Patience diff. These algorithms perform a different form of search compared to the classic Stone algorithm and support escapes when worst case scenarios are encountered. Add the -A flag to allow selection of the algorithm, but default to using the new Myers diff implementation. The libdiff implementation currently only supports a subset of input and output options supported by diff. When these options are used, but the algorithm is not selected, automatically fallback to the classic Stone algorithm until support for these modes can be added. Based on work originally done by thj@ with contributions from kevans@. Sponsored by: Klara, Inc. Reviewed by: thj Differential Revision: https://reviews.freebsd.org/D44302
86 lines
1.7 KiB
C
86 lines
1.7 KiB
C
/* $OpenBSD: xmalloc.c,v 1.10 2019/06/28 05:44:09 deraadt Exp $ */
|
|
/*
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
* All rights reserved
|
|
* Versions of malloc and friends that check their results, and never return
|
|
* failure (they call fatal if they encounter an error).
|
|
*
|
|
* As far as I am concerned, the code I have written for this software
|
|
* can be used freely for any purpose. Any derived versions of this
|
|
* software must be clearly marked as such, and if the derived work is
|
|
* incompatible with the protocol description in the RFC file, it must be
|
|
* called by a name other than "ssh" or "Secure Shell".
|
|
*/
|
|
|
|
#include <err.h>
|
|
#include <stdarg.h>
|
|
#include <stdint.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "xmalloc.h"
|
|
|
|
void *
|
|
xmalloc(size_t size)
|
|
{
|
|
void *ptr;
|
|
|
|
if (size == 0)
|
|
errx(2, "xmalloc: zero size");
|
|
ptr = malloc(size);
|
|
if (ptr == NULL)
|
|
err(2, "xmalloc: allocating %zu bytes", size);
|
|
return ptr;
|
|
}
|
|
|
|
void *
|
|
xcalloc(size_t nmemb, size_t size)
|
|
{
|
|
void *ptr;
|
|
|
|
ptr = calloc(nmemb, size);
|
|
if (ptr == NULL)
|
|
err(2, "xcalloc: allocating %zu * %zu bytes", nmemb, size);
|
|
return ptr;
|
|
}
|
|
|
|
void *
|
|
xreallocarray(void *ptr, size_t nmemb, size_t size)
|
|
{
|
|
void *new_ptr;
|
|
|
|
new_ptr = reallocarray(ptr, nmemb, size);
|
|
if (new_ptr == NULL)
|
|
err(2, "xreallocarray: allocating %zu * %zu bytes",
|
|
nmemb, size);
|
|
return new_ptr;
|
|
}
|
|
|
|
char *
|
|
xstrdup(const char *str)
|
|
{
|
|
char *cp;
|
|
|
|
if ((cp = strdup(str)) == NULL)
|
|
err(2, "xstrdup");
|
|
return cp;
|
|
}
|
|
|
|
int
|
|
xasprintf(char **ret, const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
int i;
|
|
|
|
va_start(ap, fmt);
|
|
i = vasprintf(ret, fmt, ap);
|
|
va_end(ap);
|
|
|
|
if (i == -1)
|
|
err(2, "xasprintf");
|
|
|
|
return i;
|
|
}
|