upstream/illumos/illumos-gate: comparison usr/src/cmd/tic/tic

equal deleted inserted replaced

-:76ab5b799560
+:c1ed50709bff
 * CDDL HEADER END
 */
 /*
 * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 * Use is subject to license terms.
+*
+* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
 */
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved	*/
 /*
 * University Copyright- Copyright (c) 1982, 1986, 1988
 * The Regents of the University of California
 * All Rights Reserved
 *
 * University Acknowledgment- Portions of this document are derived from
 * software developed by the University of California, Berkeley, and its
 * contributors.
 */
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 /*
 *  *******************************************************************
 *                         COPYRIGHT NOTICE                           *
 * ********************************************************************
 		old_use_count = -1;
 		DEBUG(2, "\n\nPART %d\n\n", part2);
 		while (use_list.head != NULL && old_use_count != use_count) {
 			old_use_count = use_count;
 			for (ptr = use_list.tail; ptr != NULL;
-							ptr = ptr->bptr) {
+			    ptr = ptr->bptr) {
 				fseek(stdin, ptr->offset, 0);
 				reset_input();
 				if ((token_type = get_token()) != NAMES)
 					syserr_abort(
 "Token after a seek not NAMES");
 				if (complete)
 					dequeue(ptr);
 			}
 			for (ptr = use_list.head; ptr != NULL;
-							ptr = ptr->fptr) {
+			    ptr = ptr->fptr) {
 				fseek(stdin, ptr->offset, 0);
 				reset_input();
 				if ((token_type = get_token()) != NAMES)
 					syserr_abort(
 "Token after a seek not NAMES");
 		}
 	}
 	if (use_list.head != NULL && !check_only) {
 		fprintf(stderr,
-"\nError in following up use-links.  Either there is\n");
+"\nError in following use-links. Either there is a loop in the links\n"
-		fprintf(stderr,
+"or they reference non-existent terminals. The following is a list of\n"
-"a loop in the links or they reference non-existant\n");
+"the entries involved:\n\n");
-		fprintf(stderr,
-			"terminals.  The following is a list of the entries\n");
-		fprintf(stderr, "involved:\n\n");
 		for (ptr = use_list.head; ptr != NULL; ptr = ptr->fptr) {
 			fseek(stdin, ptr->offset, 0);
 			fgets(line, 1024, stdin);
 			fprintf(stderr, "%s", line);
 	fprintf(stderr, "dump_list %s\n", str);
 	for (ptr = use_list.head; ptr != NULL; ptr = ptr->fptr) {
 		fseek(stdin, ptr->offset, 0);
 		fgets(line, 1024, stdin);
 		fprintf(stderr, "ptr %x off %d bptr %x fptr %x str %s",
-		ptr, ptr->offset, ptr->bptr, ptr->fptr, line);
+		    ptr, ptr->offset, ptr->bptr, ptr->fptr, line);
 	}
 	fprintf(stderr, "\n");
 }
 /*
 	complete = 1;
 	return (token_type);
 }
 /*
-Change all cancellations to a non-entry.
+* Change all cancellations to a non-entry.
-For booleans, @ -> false
+* For booleans, @ -> false
-For nums, @ -> -1
+* For nums, @ -> -1
-For strings, @ -> -1
+* For strings, @ -> -1
+*
-This only has to be done for entries which
+* This only has to be done for entries which
-have to be compatible with the pre-Vr3 format.
+* have to be compatible with the pre-Vr3 format.
 */
 #ifndef NOCANCELCOMPAT
 void
 elim_cancellations(short Booleans[], short Numbers[], short Strings[])
 {
 	int i;
 			Strings[i] = -1;
 	}
 }
 #endif /* NOCANCELCOMPAT */
 /*
-Change the cancellation signal from the -2 used internally to
+* Change the cancellation signal from the -2 used internally to
-the 2 used within the binary.
+* the 2 used within the binary.
 */
 void
 change_cancellations(short Booleans[])
 {
 	int i;
 	for (i = 0; i < BoolCount; i++) {
 			continue;
 		else if (isspace(*name) || (*name == '/'))
 			return (1);
 	if (error) {
 		fprintf(stderr, "%s: Line %d: Illegal terminal name - '%s'\n",
-						progname, curr_line, name);
+		    progname, curr_line, name);
 		fprintf(stderr,
-			"Terminal names must start with a letter or digit\n");
+		    "Terminal names must start with a letter or digit\n");
 		exit(1);
 	}
 	return (0);
 }
 	check_dir(first_name[0]);
 	sprintf(filename, "%c/%s", first_name[0], first_name);
-	if (strlen(filename) > 16)
-		warning("'%s' filename too long, truncating to '%.16s'\n",
-							filename, filename);
 	if (stat64(filename, &statbuf) >= 0 && statbuf.st_mtime >= start_time) {
 		warning("'%s' defined in more than one entry.", first_name);
 		fprintf(stderr, "Entry being used is '%s'.\n",
-			    (unsigned)term_names + string_table);
+		    (unsigned)term_names + string_table);
 	}
 	if (!check_only) {
 		unlink(filename);
 		fp = fopen(filename, "w");
 		if (fp == NULL) {
 			perror(filename);
-			syserr_abort("Can't open %s/%s\n",
+			syserr_abort("Can't open %s/%s\n", destination,
-							destination, filename);
+			    filename);
 		}
-		DEBUG(1, "Created %.16s\n", filename);
+		DEBUG(1, "Created %s\n", filename);
-	} else DEBUG(1, "Would have created %.16s\n", filename);
+	} else DEBUG(1, "Would have created %s\n", filename);
 #ifndef NOCANCELCOMPAT
-	/* if there is no '+' in the name, eliminate */
+	/* eliminate cancellation markings if there is no '+' in the name */
-	/* cancellation markings. */
 	if (strchr(first_name, '+') == 0)
 		elim_cancellations(Booleans, Numbers, Strings);
 	else
 #endif /* NOCANCELCOMPAT */
 		change_cancellations(Booleans);
 	if (!check_only) {
 		if (write_object(fp, Booleans, Numbers, Strings) < 0) {
-			syserr_abort("Error in writing %s/%s",
+			syserr_abort("Error writing %s/%s", destination,
-						destination, filename);
+			    filename);
 		}
 		fclose(fp);
 	}
 	alphastart = isalpha(first_name[0]);
 		}
 		if (invalid_term_name(cur_name)) {
 			if (other_names)
 				warning("'%s': bad term name found in list.",
-								cur_name);
+				    cur_name);
 			continue;
 		}
 		check_dir(cur_name[0]);
 		sprintf(linkname, "%c/%s", cur_name[0], cur_name);
-		if (strlen(linkname) > 16) {
-			if (other_names) {
-				warning(
-"'%s' linkname too long, truncating to '%.16s'\n", linkname, linkname);
-			} else {
-				continue;
-			}
-		}
 		alphastart |= isalpha(cur_name[0]);
 		if (strcmp(first_name, cur_name) == 0) {
 			warning("Terminal name '%s' synonym for itself",
-							first_name);
+			    first_name);
 		} else  {
 			if (!check_only) {
 				if (stat64(linkname, &statbuf) >= 0 &&
-					    statbuf.st_mtime >= start_time) {
+				    statbuf.st_mtime >= start_time) {
 					warning(
 "'%s' defined in more than one entry.", cur_name);
 					fprintf(stderr,
 					    "Entry being used is '%s'.\n",
 					    (unsigned)term_names +
-								string_table);
+					    string_table);
 				}
 				unlink(linkname);
 				if (link(filename, linkname) < 0)
 					syserr_abort("Can't link %s to %s",
-							filename, linkname);
+					    filename, linkname);
-				DEBUG(1, "Linked %.16s\n", linkname);
+				DEBUG(1, "Linked %s\n", linkname);
-			} else DEBUG(1, "Would have linked %.16s\n", linkname);
+			} else DEBUG(1, "Would have linked %s\n", linkname);
 		}
 	}
 	if (!alphastart) {
 		warning("At least one synonym should begin with a letter.");

changeset 13444	c1ed50709bff
parent 350	06f97f931994
child 13679	1b5898b11b55