| config.y (152024) | config.y (152865) |
|---|---|
| 1%union { 2 char *str; 3 int val; 4 struct file_list *file; 5} 6 7%token ARCH 8%token COMMA --- 53 unchanged lines hidden (view full) --- 62 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 63 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 64 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 65 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 66 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 67 * SUCH DAMAGE. 68 * 69 * @(#)config.y 8.1 (Berkeley) 6/6/93 | 1%union { 2 char *str; 3 int val; 4 struct file_list *file; 5} 6 7%token ARCH 8%token COMMA --- 53 unchanged lines hidden (view full) --- 62 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 63 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 64 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 65 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 66 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 67 * SUCH DAMAGE. 68 * 69 * @(#)config.y 8.1 (Berkeley) 6/6/93 |
| 70 * $FreeBSD: head/usr.sbin/config/config.y 152024 2005-11-03 21:27:02Z ru $ | 70 * $FreeBSD: head/usr.sbin/config/config.y 152865 2005-11-27 23:17:00Z ru $ |
| 71 */ 72 73#include <ctype.h> 74#include <err.h> 75#include <stdio.h> 76#include <string.h> 77 78#include "config.h" --- 52 unchanged lines hidden (view full) --- 131 SEMICOLON 132 | 133 error SEMICOLON 134 ; 135 136Config_spec: 137 ARCH Save_id 138 = { | 71 */ 72 73#include <ctype.h> 74#include <err.h> 75#include <stdio.h> 76#include <string.h> 77 78#include "config.h" --- 52 unchanged lines hidden (view full) --- 131 SEMICOLON 132 | 133 error SEMICOLON 134 ; 135 136Config_spec: 137 ARCH Save_id 138 = { |
| 139 if (machinename != NULL) | 139 if (machinename != NULL && !eq($2, machinename)) |
| 140 errx(1, "%s:%d: only one machine directive is allowed", 141 yyfile, yyline); 142 machinename = $2; 143 machinearch = $2; 144 } | 145 ARCH Save_id Save_id 146 = { | 140 errx(1, "%s:%d: only one machine directive is allowed", 141 yyfile, yyline); 142 machinename = $2; 143 machinearch = $2; 144 } | 145 ARCH Save_id Save_id 146 = { |
| 147 if (machinename != NULL) | 147 if (machinename != NULL && 148 !(eq($2, machinename) && eq($3, machinearch))) |
| 148 errx(1, "%s:%d: only one machine directive is allowed", 149 yyfile, yyline); 150 machinename = $2; 151 machinearch = $3; 152 } | 153 CPU Save_id 154 = { 155 struct cputype *cp = --- 255 unchanged lines hidden --- | 149 errx(1, "%s:%d: only one machine directive is allowed", 150 yyfile, yyline); 151 machinename = $2; 152 machinearch = $3; 153 } | 154 CPU Save_id 155 = { 156 struct cputype *cp = --- 255 unchanged lines hidden --- |