confdata.c (0612ec48762bf8712db1925b2e67246d2237ebab) | confdata.c (d3660a8cbdfad620af88b85b7bbfff29160f14c2) |
---|---|
1/* 2 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> 3 * Released under the terms of the GNU GPL v2.0. 4 */ 5 6#include <sys/stat.h> 7#include <ctype.h> 8#include <fcntl.h> --- 179 unchanged lines hidden (view full) --- 188 conf_warning("unexpected data"); 189 continue; 190 } 191 p = strchr(line + 7, '='); 192 if (!p) 193 continue; 194 *p++ = 0; 195 p2 = strchr(p, '\n'); | 1/* 2 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org> 3 * Released under the terms of the GNU GPL v2.0. 4 */ 5 6#include <sys/stat.h> 7#include <ctype.h> 8#include <fcntl.h> --- 179 unchanged lines hidden (view full) --- 188 conf_warning("unexpected data"); 189 continue; 190 } 191 p = strchr(line + 7, '='); 192 if (!p) 193 continue; 194 *p++ = 0; 195 p2 = strchr(p, '\n'); |
196 if (p2) 197 *p2 = 0; | 196 if (p2) { 197 *p2-- = 0; 198 if (*p2 == '\r') 199 *p2 = 0; 200 } |
198 if (def == S_DEF_USER) { 199 sym = sym_find(line + 7); 200 if (!sym) { 201 conf_warning("trying to assign nonexistent symbol %s", line + 7); 202 break; 203 } 204 } else { 205 sym = sym_lookup(line + 7, 0); --- 55 unchanged lines hidden (view full) --- 261 conf_warning("symbol value '%s' invalid for %s", p, sym->name); 262 continue; 263 } 264 break; 265 default: 266 ; 267 } 268 break; | 201 if (def == S_DEF_USER) { 202 sym = sym_find(line + 7); 203 if (!sym) { 204 conf_warning("trying to assign nonexistent symbol %s", line + 7); 205 break; 206 } 207 } else { 208 sym = sym_lookup(line + 7, 0); --- 55 unchanged lines hidden (view full) --- 264 conf_warning("symbol value '%s' invalid for %s", p, sym->name); 265 continue; 266 } 267 break; 268 default: 269 ; 270 } 271 break; |
272 case '\r': |
|
269 case '\n': 270 break; 271 default: 272 conf_warning("unexpected data"); 273 continue; 274 } 275 if (sym && sym_is_choice_value(sym)) { 276 struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym)); --- 487 unchanged lines hidden --- | 273 case '\n': 274 break; 275 default: 276 conf_warning("unexpected data"); 277 continue; 278 } 279 if (sym && sym_is_choice_value(sym)) { 280 struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym)); --- 487 unchanged lines hidden --- |