104 lines
3.4 KiB
Diff
104 lines
3.4 KiB
Diff
|
From a24efac07e0e5fcf8803ab27d03868d46d23fa3d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Erwin Waterlander <waterlan@xs4all.nl>
|
||
|
|
Date: Mon, 6 Aug 2018 20:53:35 +0200
|
||
|
|
Subject: [PATCH 05/11] Fixed a minor memory leak.
|
||
|
|
|
||
|
|
---
|
||
|
|
dos2unix/ChangeLog.txt | 7 +++++++
|
||
|
|
dos2unix/dos2unix.c | 9 ++++++---
|
||
|
|
dos2unix/po/da.po | 4 ++--
|
||
|
|
dos2unix/po/de.po | 4 ++--
|
||
|
|
dos2unix/po/dos2unix.pot | 4 ++--
|
||
|
|
dos2unix/po/eo.po | 4 ++--
|
||
|
|
dos2unix/po/es.po | 4 ++--
|
||
|
|
dos2unix/po/fr.po | 4 ++--
|
||
|
|
dos2unix/po/hu.po | 4 ++--
|
||
|
|
dos2unix/po/ja.po | 4 ++--
|
||
|
|
dos2unix/po/nb.po | 4 ++--
|
||
|
|
dos2unix/po/nl.po | 4 ++--
|
||
|
|
dos2unix/po/pl.po | 4 ++--
|
||
|
|
dos2unix/po/pt_BR.po | 4 ++--
|
||
|
|
dos2unix/po/ru.po | 4 ++--
|
||
|
|
dos2unix/po/sr.po | 4 ++--
|
||
|
|
dos2unix/po/sv.po | 4 ++--
|
||
|
|
dos2unix/po/uk.po | 4 ++--
|
||
|
|
dos2unix/po/vi.po | 4 ++--
|
||
|
|
dos2unix/po/zh_CN.po | 4 ++--
|
||
|
|
dos2unix/po/zh_TW.po | 4 ++--
|
||
|
|
dos2unix/unix2dos.c | 9 ++++++---
|
||
|
|
22 files changed, 57 insertions(+), 44 deletions(-)
|
||
|
|
|
||
|
|
diff --git dos2unix/dos2unix.c dos2unix/dos2unix.c
|
||
|
|
index 65d3850..78410a6 100644
|
||
|
|
--- dos2unix/dos2unix.c
|
||
|
|
+++ dos2unix/dos2unix.c
|
||
|
|
@@ -7,7 +7,7 @@
|
||
|
|
* See also http://www.freebsd.org/copyright/freebsd-license.html
|
||
|
|
* --------
|
||
|
|
*
|
||
|
|
- * Copyright (C) 2009-2016 Erwin Waterlander
|
||
|
|
+ * Copyright (C) 2009-2018 Erwin Waterlander
|
||
|
|
* Copyright (C) 1998 Christian Wurll
|
||
|
|
* Copyright (C) 1998 Bernd Johannes Wuebben
|
||
|
|
* Copyright (C) 1994-1995 Benjamin Lin.
|
||
|
|
@@ -504,6 +504,7 @@ int main (int argc, char *argv[])
|
||
|
|
CFlag *pFlag;
|
||
|
|
char *ptr;
|
||
|
|
char localedir[1024];
|
||
|
|
+ int ret;
|
||
|
|
# ifdef __MINGW64__
|
||
|
|
int _dowildcard = -1; /* enable wildcard expansion for Win64 */
|
||
|
|
# endif
|
||
|
|
@@ -593,9 +594,11 @@ int main (int argc, char *argv[])
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#ifdef D2U_UNICODE
|
||
|
|
- return parse_options(argc_new, argv_new, pFlag, localedir, progname, PrintLicense, ConvertDosToUnix, ConvertDosToUnixW);
|
||
|
|
+ ret = parse_options(argc_new, argv_new, pFlag, localedir, progname, PrintLicense, ConvertDosToUnix, ConvertDosToUnixW);
|
||
|
|
#else
|
||
|
|
- return parse_options(argc_new, argv_new, pFlag, localedir, progname, PrintLicense, ConvertDosToUnix);
|
||
|
|
+ ret = parse_options(argc_new, argv_new, pFlag, localedir, progname, PrintLicense, ConvertDosToUnix);
|
||
|
|
#endif
|
||
|
|
+ free(pFlag);
|
||
|
|
+ return ret;
|
||
|
|
}
|
||
|
|
|
||
|
|
diff --git dos2unix/unix2dos.c dos2unix/unix2dos.c
|
||
|
|
index 7bd17d3..aad827d 100644
|
||
|
|
--- dos2unix/unix2dos.c
|
||
|
|
+++ dos2unix/unix2dos.c
|
||
|
|
@@ -8,7 +8,7 @@
|
||
|
|
* See also http://www.freebsd.org/copyright/freebsd-license.html
|
||
|
|
* --------
|
||
|
|
*
|
||
|
|
- * Copyright (C) 2009-2016 Erwin Waterlander
|
||
|
|
+ * Copyright (C) 2009-2018 Erwin Waterlander
|
||
|
|
* Copyright (C) 1994-1995 Benjamin Lin.
|
||
|
|
* All rights reserved.
|
||
|
|
*
|
||
|
|
@@ -477,6 +477,7 @@ int main (int argc, char *argv[])
|
||
|
|
CFlag *pFlag;
|
||
|
|
char *ptr;
|
||
|
|
char localedir[1024];
|
||
|
|
+ int ret;
|
||
|
|
# ifdef __MINGW64__
|
||
|
|
int _dowildcard = -1; /* enable wildcard expansion for Win64 */
|
||
|
|
# endif
|
||
|
|
@@ -566,9 +567,11 @@ int main (int argc, char *argv[])
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#ifdef D2U_UNICODE
|
||
|
|
- return parse_options(argc_new, argv_new, pFlag, localedir, progname, PrintLicense, ConvertUnixToDos, ConvertUnixToDosW);
|
||
|
|
+ ret = parse_options(argc_new, argv_new, pFlag, localedir, progname, PrintLicense, ConvertUnixToDos, ConvertUnixToDosW);
|
||
|
|
#else
|
||
|
|
- return parse_options(argc_new, argv_new, pFlag, localedir, progname, PrintLicense, ConvertUnixToDos);
|
||
|
|
+ ret = parse_options(argc_new, argv_new, pFlag, localedir, progname, PrintLicense, ConvertUnixToDos);
|
||
|
|
#endif
|
||
|
|
+ free(pFlag);
|
||
|
|
+ return ret;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.19.1
|
||
|
|
|