head	1.3;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.2
	OPENPKG_E1_MP:1.2
	OPENPKG_E1_MP_2_STABLE:1.2
	OPENPKG_E1_FP:1.2
	OPENPKG_2_STABLE_MP:1.2
	OPENPKG_2_STABLE_20061018:1.2
	OPENPKG_2_STABLE_20060622:1.2
	OPENPKG_2_STABLE:1.2.0.2
	OPENPKG_2_STABLE_BP:1.2;
locks; strict;
comment	@# @;


1.3
date	2008.11.30.10.25.48;	author rse;	state Exp;
branches;
next	1.2;
commitid	CTth7knrftxBBCst;

1.2
date	2006.04.04.12.35.12;	author rse;	state Exp;
branches;
next	1.1;
commitid	oVwyZ97pLYR4xQrr;

1.1
date	2006.03.27.17.55.49;	author rse;	state Exp;
branches;
next	;
commitid	bycmoProMuh2zQqr;


desc
@@


1.3
log
@upgrading package: mtools 3.9.11 -> 4.0.0
@
text
@Index: charsetConv.c
--- charsetConv.c.orig	2008-11-18 22:33:11 +0100
+++ charsetConv.c	2008-11-30 11:20:02 +0100
@@@@ -266,10 +266,12 @@@@
 int wchar_to_native(const wchar_t *wchar, char *native, size_t len)
 {
 #ifdef HAVE_ICONV_H
+	int l;
 	int mangled;
 	int r;
 	initialize_to_native();
-	len = wcsnlen(wchar,len);
+	l = wcslen(wchar);
+	len = (l > len ? len : l);
 	r=safe_iconv(to_native, wchar, native, len, &mangled);
 	native[r]='\0';
 	return r;
Index: config.c
--- config.c.orig	2008-11-28 23:24:37 +0100
+++ config.c	2008-11-30 11:19:42 +0100
@@@@ -707,13 +707,7 @@@@
 	memcpy(devices, const_devices,
 	       nr_const_devices*sizeof(struct device));
 
-    (void) ((parse(CONF_FILE,1) |
-	     parse(LOCAL_CONF_FILE,1) |
-	     parse(SYS_CONF_FILE,1)) ||
-	    (parse(OLD_CONF_FILE,1) |
-	     parse(OLD_LOCAL_CONF_FILE,1)));
-    /* the old-name configuration files only get executed if none of the
-     * new-name config files were used */
+    (void)parse(SYS_CONF_FILE, 1);
 
     homedir = get_homedir();
     if ( homedir ){
@


1.2
log
@apply the latest vendor patch set
@
text
@d1 17
d19 3
a21 3
--- config.c.orig	2004-02-28 18:40:23 +0100
+++ config.c	2006-03-27 19:48:21 +0200
@@@@ -679,13 +679,7 @@@@
d25 1
a25 1
-    (void) ((parse(CONF_FILE,1) | 
d28 1
a28 1
-	    (parse(OLD_CONF_FILE,1) | 
d32 1
a32 1
+    (void) parse(SYS_CONF_FILE, 1);
@


1.1
log
@add support for configuration file and install a default one; add missing newline in mdel(1) output
@
text
@a18 12
Index: mdel.c
--- mdel.c.orig	2005-02-13 15:49:22 +0100
+++ mdel.c	2006-03-27 19:43:36 +0200
@@@@ -125,7 +125,7 @@@@
 	fprintf(stderr, 
 		"Mtools version %s, dated %s\n", mversion, mdate);
 	fprintf(stderr, 
-		"Usage: %s [-v] msdosfile [msdosfiles...]", progname);
+		"Usage: %s [-v] msdosfile [msdosfiles...]\n", progname);
 	exit(1);
 }
 
@