X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=extension.c;h=edfe5eb3e37129f1f476289a74cd631a362d335f;hp=a1c3aa787febc7a3d4c7e57678f482af12f9246d;hb=d19b20fa4e130683b9b5c088019f5988e6b8e19b;hpb=6db34c1dca5c3a2acd0af689319b583ff8271dbc

diff --git a/extension.c b/extension.c
index a1c3aa7..edfe5eb 100644
--- a/extension.c
+++ b/extension.c
@@ -68,10 +68,8 @@ int read_extension(struct extension *ext, char *num)
 	ext->vbox_codec = CODEC_MONO;
 
 	line=0;
-	while((fgets(buffer, sizeof(buffer), fp))) {
+	while((GETLINE(buffer, fp))) {
 		line++;
-		buffer[sizeof(buffer)-1] = '\0';
-		if (buffer[0]) buffer[strlen(buffer)-1] = '\0';
 		p = buffer;
 
 		while(*p <= 32) { /* skip spaces */
@@ -969,7 +967,7 @@ int write_extension(struct extension *ext, char *number)
 	fprintf(fp,"own_cause       %s\n\n",ext_yesno[ext->own_cause]);
 
 	fprintf(fp,"# Allow facility information to be transfered to the telephone.\n");
-	fprintf(fp,"# This is equired to receive advice of charge.\n");
+	fprintf(fp,"# This is required to receive advice of charge.\n");
 	fprintf(fp,"facility        %s\n\n",ext_yesno[ext->facility]);
 
 	fprintf(fp,"# Display clear causes using display messages (Q.850)\n# This must be one of the following:\n");
@@ -1228,10 +1226,8 @@ int parse_phonebook(char *number, char **abbrev_pointer, char **phone_pointer, c
 	}
 
 	line=0;
-	while((fgets(buffer, sizeof(buffer), fp))) {
+	while((GETLINE(buffer, fp))) {
 		line++;
-		buffer[sizeof(buffer)-1] = '\0';
-		if (buffer[0]) buffer[strlen(buffer)-1] = '\0';
 		p = buffer;
 
 		while(*p <= 32) { /* skip spaces */
@@ -1351,10 +1347,8 @@ int parse_secrets(char *number, char *remote_id, char **auth_pointer, char **cry
 	}
 
 	line=0;
-	while((fgets(buffer, sizeof(buffer), fp))) {
+	while((GETLINE(buffer, fp))) {
 		line++;
-		buffer[sizeof(buffer)-1] = '\0';
-		if (buffer[0]) buffer[strlen(buffer)-1] = '\0';
 		p = buffer;
 
 		while(*p <= 32) { /* skip spaces */
@@ -1476,10 +1470,8 @@ char *parse_directory(char *number, int type)
 	}
 
 	line=0;
-	while((fgets(buffer, sizeof(buffer), fp))) {
+	while((GETLINE(buffer, fp))) {
 		line++;
-		buffer[sizeof(buffer)-1] = '\0';
-		if (buffer[0]) buffer[strlen(buffer)-1] = '\0';
 		p = buffer;
 
 		while(*p <= 32) { /* skip spaces */
@@ -1611,10 +1603,8 @@ int parse_callbackauth(char *number, struct caller_info *callerinfo)
 	}
 
 	line=0;
-	while((fgets(buffer, sizeof(buffer), fp))) {
+	while((GETLINE(buffer, fp))) {
 		line++;
-		buffer[sizeof(buffer)-1] = '\0';
-		if (buffer[0]) buffer[strlen(buffer)-1] = '\0';
 		p = buffer;
 
 		while(*p <= 32) { /* skip spaces */