diff options
author | Brooks Davis <brooks@FreeBSD.org> | 2004-05-27 17:23:32 +0000 |
---|---|---|
committer | Brooks Davis <brooks@FreeBSD.org> | 2004-05-27 17:23:32 +0000 |
commit | d49b8d3917334c842b0ac5611850f7d79b27676e (patch) | |
tree | 0ea9ad61f2239b9dfb8dcb14bfc6342c38720a7e | |
parent | 9a7be62a1c2932a17c144f048983f164d6ce68a6 (diff) | |
download | src-d49b8d3917334c842b0ac5611850f7d79b27676e.tar.gz src-d49b8d3917334c842b0ac5611850f7d79b27676e.zip |
Fix stupid patch(1) tricks. Apparently patch thinks all files match the
empty file so if you accidently apply a patch created with diff -N
twice, you get files with duplicate contents.
Reported by: Antoine Brodin <antoine.brodin at laposte.net>
Notes
Notes:
svn path=/head/; revision=129782
-rw-r--r-- | tools/regression/lib/libc/net/test-eui64.h | 55 | ||||
-rw-r--r-- | tools/regression/lib/libc/net/test-eui64_aton.c | 68 | ||||
-rw-r--r-- | tools/regression/lib/libc/net/test-eui64_line.c | 76 | ||||
-rw-r--r-- | tools/regression/lib/libc/net/test-eui64_ntoa.c | 52 |
4 files changed, 0 insertions, 251 deletions
diff --git a/tools/regression/lib/libc/net/test-eui64.h b/tools/regression/lib/libc/net/test-eui64.h index 8a6554d40c68..ea82a10c1487 100644 --- a/tools/regression/lib/libc/net/test-eui64.h +++ b/tools/regression/lib/libc/net/test-eui64.h @@ -53,58 +53,3 @@ struct eui64 test_eui64_mac48 = {{0x00,0x11,0x22,0xFF,0xFF,0x33,0x44,0x55}}; #define test_eui64_line_eui48_6byte_c "00:11:22:33:44:55 eui-48" #endif /* !_TEST_EUI64_H */ -/* - * Copyright 2004 The Aerospace Corporation. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions, and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions, and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of The Aerospace Corporation may not be used to endorse or - * promote products derived from this software. - * - * THIS SOFTWARE IS PROVIDED BY THE AEROSPACE CORPORATION "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AEROSPACE CORPORATION BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ -#ifndef _TEST_EUI64_H -#define _TEST_EUI64_H - -struct eui64 test_eui64_id = {{0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77}}; -struct eui64 test_eui64_eui48 = {{0x00,0x11,0x22,0xFF,0xFE,0x33,0x44,0x55}}; -struct eui64 test_eui64_mac48 = {{0x00,0x11,0x22,0xFF,0xFF,0x33,0x44,0x55}}; - -#define test_eui64_id_ascii "00-11-22-33-44-55-66-77" -#define test_eui64_id_colon_ascii "00:11:22:33:44:55:66:77" -#define test_eui64_hex_ascii "0x0011223344556677" -#define test_eui64_eui48_ascii "00-11-22-ff-fe-33-44-55" -#define test_eui64_mac48_ascii "00-11-22-ff-fe-33-44-55" -#define test_eui64_mac_ascii "00-11-22-33-44-55" -#define test_eui64_mac_colon_ascii "00:11:22:33:44:55" -#define test_eui64_id_host "id" -#define test_eui64_eui48_host "eui-48" -#define test_eui64_mac48_host "mac-48" - -#define test_eui64_line_id "00-11-22-33-44-55-66-77 id" -#define test_eui64_line_id_colon "00:11:22:33:44:55:66:77 id" -#define test_eui64_line_eui48 "00-11-22-FF-fe-33-44-55 eui-48" -#define test_eui64_line_mac48 "00-11-22-FF-ff-33-44-55 mac-48" -#define test_eui64_line_eui48_6byte "00-11-22-33-44-55 eui-48" -#define test_eui64_line_eui48_6byte_c "00:11:22:33:44:55 eui-48" - -#endif /* !_TEST_EUI64_H */ diff --git a/tools/regression/lib/libc/net/test-eui64_aton.c b/tools/regression/lib/libc/net/test-eui64_aton.c index 112aadcd1e8d..7957d57de67e 100644 --- a/tools/regression/lib/libc/net/test-eui64_aton.c +++ b/tools/regression/lib/libc/net/test-eui64_aton.c @@ -66,71 +66,3 @@ main(int argc, char **argv) return (0); } -/* - * Copyright 2004 The Aerospace Corporation. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions, and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions, and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of The Aerospace Corporation may not be used to endorse or - * promote products derived from this software. - * - * THIS SOFTWARE IS PROVIDED BY THE AEROSPACE CORPORATION "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AEROSPACE CORPORATION BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#include <sys/types.h> -#include <sys/eui64.h> -#include <stdio.h> -#include <string.h> - -#include "test-eui64.h" - -static int -test_str( const char *str, const struct eui64 *eui) -{ - struct eui64 e; - char buf[EUI64_SIZ]; - - if (eui64_aton(str, &e) != 0 && - memcmp(&e, &eui, sizeof(struct eui64)) != 0) { - printf("FAIL: eui64_aton(%s)\n", str); - eui64_ntoa(&e, buf, sizeof(buf)); - printf("got: %s\n", buf); - return (0); - } else { - printf("PASS: eui64_aton(%s)\n", str); - return (1); - } - -} - -int -main(int argc, char **argv) -{ - - test_str(test_eui64_id_ascii, &test_eui64_id); - test_str(test_eui64_id_colon_ascii, &test_eui64_id); - test_str(test_eui64_mac_ascii, &test_eui64_eui48); - test_str(test_eui64_mac_colon_ascii, &test_eui64_eui48); - test_str(test_eui64_hex_ascii, &test_eui64_id); - - return (0); -} diff --git a/tools/regression/lib/libc/net/test-eui64_line.c b/tools/regression/lib/libc/net/test-eui64_line.c index ab14f2122c14..463042a4cdce 100644 --- a/tools/regression/lib/libc/net/test-eui64_line.c +++ b/tools/regression/lib/libc/net/test-eui64_line.c @@ -74,79 +74,3 @@ main(int argc, char **argv) return (0); } -/* - * Copyright 2004 The Aerospace Corporation. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions, and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions, and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of The Aerospace Corporation may not be used to endorse or - * promote products derived from this software. - * - * THIS SOFTWARE IS PROVIDED BY THE AEROSPACE CORPORATION "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AEROSPACE CORPORATION BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#include <sys/types.h> -#include <sys/eui64.h> -#include <stdio.h> -#include <string.h> - -#include "test-eui64.h" - -static int -test_line(const char *line, const struct eui64 *eui, const char *host) -{ - struct eui64 e; - char buf[256]; - - if (eui64_line(line, &e, buf, sizeof(buf)) != 0 || - memcmp(&e, eui, sizeof(struct eui64)) != 0 || - strcmp(buf, host) != 0) { - printf("FAIL: eui64_line(\"%s\")\n", line); - printf("host = %s\n", buf); - eui64_ntoa(&e, buf, sizeof(buf)); - printf("e = %s\n", buf); - return (0); - } else { - printf("PASS: eui64_line(\"%s\")\n", line); - return (1); - } -} - -int -main(int argc, char **argv) -{ - - test_line(test_eui64_line_id, &test_eui64_id, - test_eui64_id_host); - test_line(test_eui64_line_id_colon, &test_eui64_id, - test_eui64_id_host); - test_line(test_eui64_line_eui48, &test_eui64_eui48, - test_eui64_eui48_host); - test_line(test_eui64_line_mac48, &test_eui64_mac48, - test_eui64_mac48_host); - test_line(test_eui64_line_eui48_6byte, &test_eui64_eui48, - test_eui64_eui48_host); - test_line(test_eui64_line_eui48_6byte_c, &test_eui64_eui48, - test_eui64_eui48_host); - - return (0); -} diff --git a/tools/regression/lib/libc/net/test-eui64_ntoa.c b/tools/regression/lib/libc/net/test-eui64_ntoa.c index 44b184791b96..c320329d24d0 100644 --- a/tools/regression/lib/libc/net/test-eui64_ntoa.c +++ b/tools/regression/lib/libc/net/test-eui64_ntoa.c @@ -50,55 +50,3 @@ main(int argc, char **argv) printf("FAIL: eui64_ntoa\n"); return (0); } -/* - * Copyright 2004 The Aerospace Corporation. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions, and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions, and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of The Aerospace Corporation may not be used to endorse or - * promote products derived from this software. - * - * THIS SOFTWARE IS PROVIDED BY THE AEROSPACE CORPORATION "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AEROSPACE CORPORATION BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#include <sys/types.h> -#include <sys/eui64.h> -#include <stdio.h> -#include <string.h> - -#include "test-eui64.h" - -int -main(int argc, char **argv) -{ - char a[EUI64_SIZ]; - - if (eui64_ntoa(&test_eui64_id, a, sizeof(a)) == 0 && - strcmp(a, test_eui64_id_ascii) == 0) { - printf("PASS: eui64_ntoa\n"); - return (0); - } - printf("a = '%s'\n", a); - - printf("FAIL: eui64_ntoa\n"); - return (0); -} |