[digraphanalysis-cvs] digraphanalysis/src BSDmakefile, main.c,

[Jeff B. <jb...@us...>]

Update of /cvsroot/digraphanalysis/digraphanalysis/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19894/src

Modified Files:
	main.c 
Added Files:
	BSDmakefile 
Log Message:
outputs gpg stuff now


--- NEW FILE: BSDmakefile ---
#  $Id: BSDmakefile,v 1.1 2005/04/26 03:49:27 jbreker Exp $
# 
#  Copyright (C) 2005 Jeff Breker <jb...@sy...>
# 
#  Permission to use, copy, modify, and distribute this software for any
#  purpose with or without fee is hereby granted, provided that the above
#  copyright notice and this permission notice appear in all copies.
# 
#  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
#  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
#  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
#  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
#  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
#  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
#  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

PROG=	digraphanalysis
SRCS=	alias.c \
	graph.c \
	main.c \
	node.c

.include <bsd.prog.mk>

Index: main.c
===================================================================
RCS file: /cvsroot/digraphanalysis/digraphanalysis/src/main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** main.c	18 Apr 2005 14:53:29 -0000	1.5
--- main.c	26 Apr 2005 03:49:27 -0000	1.6
***************
*** 243,250 ****
  
  	if(string != NULL)
- 	{
  		fgets(string, size, stdin);
- 		*(string + size) = '\0';
- 	}
  
  	return string;
--- 243,247 ----
***************
*** 376,380 ****
  	{
  		if(((c = getchar()) != ':') && (c != EOF))
! 			errx(EX_DATAERR, "Invalid character, %c (ASCII: %d), encountered!\n", c, c);
  		if(c == EOF)
  			break;
--- 373,377 ----
  	{
  		if(((c = getchar()) != ':') && (c != EOF))
! 			errx(EX_DATAERR, "1: Invalid character, %c (ASCII: %d), encountered!\n", c, c);
  		if(c == EOF)
  			break;
***************
*** 386,390 ****
  		{
  			if(((c = getchar()) != ':') && (c != EOF))
! 				errx(EX_DATAERR, "Invalid character, %c (ASCII: %d), encountered!\n", c, c);
  			if(c == EOF)
  				break;
--- 383,387 ----
  		{
  			if(((c = getchar()) != ':') && (c != EOF))
! 				errx(EX_DATAERR, "2: Invalid character, %c (ASCII: %d), encountered!\n", c, c);
  			if(c == EOF)
  				break;
***************
*** 396,400 ****
  			{
  				if(((c = getchar()) != ':') && (c != EOF))
! 					errx(EX_DATAERR, "Invalid character, %c (ASCII: %d), encountered!\n", c, c);
  				if(c == EOF)
  					break;
--- 393,397 ----
  			{
  				if(((c = getchar()) != ':') && (c != EOF))
! 					errx(EX_DATAERR, "3: Invalid character, %c (ASCII: %d), encountered!\n", c, c);
  				if(c == EOF)
  					break;
***************
*** 406,410 ****
  		}
  		if(((c = getchar()) != '\n') && (c != EOF))
! 			errx(EX_DATAERR, "Invalid character, %c (ASCII: %d), encountered!\n", c, c);
  
  		switch (type)
--- 403,407 ----
  		}
  		if(((c = getchar()) != '\n') && (c != EOF))
! 			errx(EX_DATAERR, "4: Invalid character, %c (ASCII: %d), encountered!\n", c, c);
  
  		switch (type)
***************
*** 450,454 ****
  
  	if(c != EOF)
! 		errx(EX_DATAERR, "Invalid character, %c (ASCII: %d), encountered!\n", type, type);
  
  	return;
--- 447,451 ----
  
  	if(c != EOF)
! 		errx(EX_DATAERR, "5: Invalid character, %c (ASCII: %d), encountered!\n", type, type);
  
  	return;