| map.c (216370) | map.c (229403) |
|---|---|
| 1/*- 2 * Copyright (c) 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 15 unchanged lines hidden (view full) --- 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 */ 29 30#include <sys/cdefs.h> 31 | 1/*- 2 * Copyright (c) 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 15 unchanged lines hidden (view full) --- 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 */ 29 30#include <sys/cdefs.h> 31 |
| 32__FBSDID("$FreeBSD: head/usr.bin/tset/map.c 216370 2010-12-11 08:32:16Z joel $"); | 32__FBSDID("$FreeBSD: head/usr.bin/tset/map.c 229403 2012-01-03 18:51:58Z ed $"); |
| 33 34#ifndef lint 35static const char sccsid[] = "@(#)map.c 8.1 (Berkeley) 6/9/93"; 36#endif 37 38#include <sys/types.h> 39 40#include <err.h> --- 86 unchanged lines hidden (view full) --- 127 goto next; 128 } 129 130next: if (*arg == ':') { 131 if (mapp->conditional) 132 goto badmopt; 133 ++arg; 134 } else { /* Optional baudrate. */ | 33 34#ifndef lint 35static const char sccsid[] = "@(#)map.c 8.1 (Berkeley) 6/9/93"; 36#endif 37 38#include <sys/types.h> 39 40#include <err.h> --- 86 unchanged lines hidden (view full) --- 127 goto next; 128 } 129 130next: if (*arg == ':') { 131 if (mapp->conditional) 132 goto badmopt; 133 ++arg; 134 } else { /* Optional baudrate. */ |
| 135 arg = index(p = arg, ':'); | 135 arg = strchr(p = arg, ':'); |
| 136 if (arg == NULL) 137 goto badmopt; 138 *arg++ = '\0'; 139 mapp->speed = tset_baudrate(p); 140 } 141 142 if (*arg == '\0') /* Non-optional type. */ 143 goto badmopt; --- 109 unchanged lines hidden --- | 136 if (arg == NULL) 137 goto badmopt; 138 *arg++ = '\0'; 139 mapp->speed = tset_baudrate(p); 140 } 141 142 if (*arg == '\0') /* Non-optional type. */ 143 goto badmopt; --- 109 unchanged lines hidden --- |