From 598b0256a354cb2e65ea240e50662d4378f5462c Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Sat, 14 Oct 2017 00:05:03 +0300
Subject: Merge with latest original package version (master branch)

---
 libpkgconf/fileio.c.orig | 121 -----------------------------------------------
 1 file changed, 121 deletions(-)
 delete mode 100644 libpkgconf/fileio.c.orig

(limited to 'libpkgconf/fileio.c.orig')

diff --git a/libpkgconf/fileio.c.orig b/libpkgconf/fileio.c.orig
deleted file mode 100644
index eb073d5..0000000
--- a/libpkgconf/fileio.c.orig
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * fileio.c
- * File reading utilities
- *
- * Copyright (c) 2012 pkgconf authors (see AUTHORS).
- *
- * Permission to use, copy, modify, and/or 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.
- *
- * This software is provided 'as is' and without any warranty, express or
- * implied.  In no event shall the authors be liable for any damages arising
- * from the use of this software.
- */
-
-#include <libpkgconf/stdinc.h>
-#include <libpkgconf/libpkgconf.h>
-
-char *
-pkgconf_fgetline(char *line, size_t size, FILE *stream)
-{
-	char *s = line;
-	char *end = line + size - 1;
-	bool quoted = false;
-	int c = '\0', c2;
-
-	if (s == NULL)
-		return NULL;
-
-	while (s < end && (c = getc(stream)) != EOF)
-	{
-		if (c == '\\')
-		{
-			quoted = true;
-			continue;
-		}
-		else if (c == '#')
-		{
-			if (!quoted) {
-				/* Skip the rest of the line */
-				do {
-					c = getc(stream);
-				} while (c != '\n' && c != EOF);
-				*s++ = c;
-				break;
-			}
-			quoted = false;
-			continue;
-		}
-		else if (c == '\n')
-		{
-			if (quoted)
-			{
-				/* Trim spaces */
-				do {
-					c2 = getc(stream);
-				} while (c2 == '\t' || c2 == ' ');
-
-				ungetc(c2, stream);
-
-				quoted = false;
-				continue;
-			}
-			else
-			{
-				*s++ = c;
-			}
-
-			break;
-		}
-		else if (c == '\r')
-		{
-			*s++ = '\n';
-
-			if ((c2 = getc(stream)) == '\n')
-			{
-				if (quoted)
-				{
-					quoted = false;
-					continue;
-				}
-
-				break;
-			}
-
-			ungetc(c2, stream);
-
-			if (quoted)
-			{
-				quoted = false;
-				continue;
-			}
-
-			break;
-		}
-		else
-		{
-			if (quoted) {
-				*s++ = '\\';
-				quoted = false;
-			}
-			*s++ = c;
-		}
-
-	}
-
-	if (c == EOF && (s == line || ferror(stream)))
-		return NULL;
-
-	*s = '\0';
-
-	/* Remove newline character. */
-	if (s > line && *(--s) == '\n') {
-		*s = '\0';
-
-		if (s > line && *(--s) == '\r')
-			*s = '\0';
-	}
-
-	return line;
-}
-- 
cgit v1.1