Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Oops, fix one more conflict.

Browse Source
This commit is contained in:
mellon 2000-07-08 20:53:57 +00:00
parent d1340e80d6
commit f1157334e4
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.sbin/dhcp/common/options.c
View File

@ -43,7 +43,7 @@
#ifndef lint
static char copyright[] =
"$Id: options.c,v 1.6 2000/07/08 20:52:12 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium. All rights reserved.\n";
"$Id: options.c,v 1.7 2000/07/08 20:53:57 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#define DHCP_OPTION_DATA
@ -672,18 +672,11 @@ const char *pretty_print_option (code, data, len, emit_commas, emit_quotes)
case 't':
if (emit_quotes)
*op++ = '"';
<<<<<<< options.c
for (; dp < data + len; dp++) {
if (!isascii (*dp) ||
!isprint (*dp)) {
sprintf (op, "\\\\%03o", *dp);
=======
for (; dp < data + len; dp++) {
if (!isascii (*dp) ||
!isprint (*dp)) {
sprintf (op, "\\%03o",
*dp);
>>>>>>> 1.1.1.13
op += 4;
} else if (*dp == '"' ||
*dp == '\'' ||