[net.news.b] fix recordings from postnews

puder@burdvax.UUCP (09/21/83)

I have attempted to fix "inews -h" so recordings will work from postnews.
Is there anything wrong with this?

92c92,93
< 	header.title[0] = header.nbuf[0] = filename[0] = '\0';
---
> 	header.title[0] = header.nbuf[0] =
> 		header.organization[0] = filename[0] = '\0';
240a242,260
> /* This if stmt moved from far below (and PROC added) so recordings will work */
> 	if (mode != PROC && hflag) {
> 		/* Fill in a few to make frmread return TRUE */
> 		strcpy(header.subdate, "today");
> 		strcpy(header.path, "me");
> 		strcpy(header.oident, "id");
> 		/* Allow the user to supply some headers. */
> 		hread(&header, stdin, FALSE);
> 		/* But there are certain fields we won't let him specify. */
> 		if (header.from)
> 			strcpy(forgedname, header.from);
> 		header.from[0] = '\0';
> 		header.path[0] = '\0';
> 		header.subdate[0] = '\0';
> 		header.sender[0] = '\0';
> 		if (strcmp(header.oident, "id") == 0)
> 			header.oident[0] = '\0';
> 		ngcat(header.nbuf);
> 	}
271,275c291,297
< 		strcpy(header.organization, MYORG);
< 		if (strncmp(header.organization, "Frobozz", 7) == 0)
< 			header.organization[0] = '\0';
< 		if (ptr = getenv("ORGANIZATION"))
< 			strcpy(header.organization, ptr);
---
> 		if (! *header.organization ) {
> 			strcpy(header.organization, MYORG);
> 			if (strncmp(header.organization, "Frobozz", 7) == 0)
> 				header.organization[0] = '\0';
> 			if (ptr = getenv("ORGANIZATION"))
> 				strcpy(header.organization, ptr);
> 		}
292,309c314,316
< 		if (hflag) {
< 			/* Fill in a few to make frmread return TRUE */
< 			strcpy(header.subdate, "today");
< 			strcpy(header.path, "me");
< 			strcpy(header.oident, "id");
< 			/* Allow the user to supply some headers. */
< 			hread(&header, stdin, FALSE);
< 			/* But there are certain fields we won't let him specify. */
< 			if (header.from)
< 				strcpy(forgedname, header.from);
< 			header.from[0] = '\0';
< 			header.path[0] = '\0';
< 			header.subdate[0] = '\0';
< 			header.sender[0] = '\0';
< 			if (strcmp(header.oident, "id") == 0)
< 				header.oident[0] = '\0';
< 			ngcat(header.nbuf);
< 		}
---
> /* hflag conditional read of headers moved from here to before
>  * recording messages * puder 9/21/83
>  */
-- 

Karl Puder   {sdcrdcf,presby,psuvax}!burdvax!puder   (215)648-7555