r17 - /packages/flasm/trunk/debian/patches/01-config-file.patch
pabs-guest at users.alioth.debian.org
pabs-guest at users.alioth.debian.org
Sun Jun 11 14:49:01 UTC 2006
Author: pabs-guest
Date: Sun Jun 11 14:48:56 2006
New Revision: 17
URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=17
Log:
Fix line endings in the config patch
Modified:
packages/flasm/trunk/debian/patches/01-config-file.patch
Modified: packages/flasm/trunk/debian/patches/01-config-file.patch
URL: http://svn.debian.org/wsvn/pkg-flash/packages/flasm/trunk/debian/patches/01-config-file.patch?rev=17&op=diff
==============================================================================
--- packages/flasm/trunk/debian/patches/01-config-file.patch (original)
+++ packages/flasm/trunk/debian/patches/01-config-file.patch Sun Jun 11 14:48:56 2006
@@ -3,26 +3,26 @@
Patch flasm to search for /etc/flasm.ini
Index: flasm.c
===================================================================
---- flasm.c.orig 2006-06-11 22:15:41.000000000 +0800
-+++ flasm.c 2006-06-11 22:16:10.000000000 +0800
-@@ -1468,18 +1468,8 @@
- int k;
-
- if ((iniFile = fopen("flasm.ini", "r")) == NULL) {
-- /* flasm.ini not found in current directory, look at executable's path */
-- int pathlen = strlen(exepath);
-- char inipath[pathlen + 10], *inipathptr;
-- if (exepath == NULL || *exepath == '\0')
-- return -1;
-- strcpy(inipath, exepath);
-- inipathptr = inipath + pathlen;
-- while (*inipathptr != '\\' && *inipathptr != '/' && *inipathptr != ':' && inipathptr>=inipath)
-- inipathptr--;
--
-- strcpy(inipathptr + 1, "flasm.ini");
-- if ((iniFile = fopen(inipath, "r")) == NULL)
-+ /* flasm.ini not found in current directory, look at config path */
-+ if ((iniFile = fopen("/etc/flasm.ini", "r")) == NULL)
- return -1;
- }
-
+--- flasm.c.orig 2006-05-31 10:18:41.000000000 +0800
++++ flasm.c 2006-06-11 22:47:05.000000000 +0800
+@@ -1464,18 +1464,8 @@
+ int k;
+
+ if ((iniFile = fopen("flasm.ini", "r")) == NULL) {
+- /* flasm.ini not found in current directory, look at executable's path */
+- int pathlen = strlen(exepath);
+- char inipath[pathlen + 10], *inipathptr;
+- if (exepath == NULL || *exepath == '\0')
+- return -1;
+- strcpy(inipath, exepath);
+- inipathptr = inipath + pathlen;
+- while (*inipathptr != '\\' && *inipathptr != '/' && *inipathptr != ':' && inipathptr>=inipath)
+- inipathptr--;
+-
+- strcpy(inipathptr + 1, "flasm.ini");
+- if ((iniFile = fopen(inipath, "r")) == NULL)
++ /* flasm.ini not found in current directory, look at config path */
++ if ((iniFile = fopen("/etc/flasm.ini", "r")) == NULL)
+ return -1;
+ }
+
More information about the pkg-flash-devel
mailing list