head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.8 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.6 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.4 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.2 pkgsrc-2011Q2-base:1.6 pkgsrc-2010Q3:1.5.0.6 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.4 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.2 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.4.0.2 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.3.0.24 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.22 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.20 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.18 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.16 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.14 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.12 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.10 pkgsrc-2008Q1:1.3.0.8 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.6 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.4 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.2 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.2.0.6 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.4 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.2 pkgsrc-2006Q3-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.6 date 2010.11.17.19.14.34; author plunky; state dead; branches; next 1.5; 1.5 date 2010.01.15.17.48.44; author plunky; state Exp; branches; next 1.4; 1.4 date 2009.12.01.11.18.48; author drochner; state Exp; branches; next 1.3; 1.3 date 2007.05.22.18.53.56; author plunky; state Exp; branches; next 1.2; 1.2 date 2006.07.09.16.35.31; author xtraeme; state Exp; branches; next 1.1; 1.1 date 2006.07.02.18.18.34; author xtraeme; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2006.07.02.18.18.34; author xtraeme; state Exp; branches; next ; desc @@ 1.6 log @update to obexapp 1.4.14, with a clump of minor fixes submitted by Iain Hibbert: - use libexpat instead of FreeBSD internal libbsdxml - fix off by one error with busy spinner, which sometimes resulted in a spurious backspace in the output - fflush(stdout) for busy spinner - print streaming statistics after transfers in client mode - use HAVE_BT_DEVADDR rather than testing for __NetBSD__ - use bdaddr_any() functions instead of memcpy() - allow server mode to bind to channel 0, indicating to the OS that the first available channel should be used - prevent busy loop bug if the socket is remotely closed causing the read() to return 0 bytes - fix some [unsigned comparison] compiler warnings - provide connection ID for all get requests, improves compatibility with remote windows mobile devices @ text @$NetBSD: patch-ac,v 1.5 2010/01/15 17:48:44 plunky Exp $ --- util.c.orig 2010-01-08 19:37:12.000000000 +0000 +++ util.c @@@@ -30,9 +30,9 @@@@ */ #include -#include #include #include +#include #include #include #include @ 1.5 log @ fairly minor update to 1.4.13 - obexapp does not now require GNU libiconv (this was in pkgsrc already) - compiler errors fixed - no longer tries to provide username/groupname in file listings (info not available in chroot) @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.4 2009/12/01 11:18:48 drochner Exp $ @ 1.4 log @Make this work with BSD native iconv(3). This was tested by sending vcards with non-ASCII names; the result was identical as before with GNU libiconv. bump PKGREVISION approved by plunky @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- util.c.orig 2009-08-20 23:57:18.000000000 +0200 d14 1 a15 70 #include @@@@ -43,6 +43,7 @@@@ #include #include #include +#include #include #include @@@@ -66,26 +67,12 @@@@ static iconv_t locale2utf16be = (iconv int obexapp_util_locale_init(void) { - int one = 1; - locale = setlocale(LC_CTYPE, ""); + setlocale(LC_CTYPE, ""); + locale = nl_langinfo(CODESET); if (locale == NULL) return (-1); - if (strcmp(locale, "ASCII") == 0 || - strcmp(locale, "C") == 0 || - strcmp(locale, "POSIX") == 0 || - strcmp(locale, "US-ASCII") == 0) - locale = "en_US.US-ASCII"; - - locale = strchr(locale, '.'); - if (locale == NULL) - return (-1); - - locale ++; - if (locale[0] == '\0') - return (-1); - utf16 = (strstr(locale, "UTF-16") != NULL)? 1 : 0; /* UTF-8 -> current locale */ @@@@ -94,7 +81,6 @@@@ obexapp_util_locale_init(void) return (-1); iconv(utf82locale, NULL, NULL, NULL, NULL); - iconvctl(utf82locale, ICONV_SET_DISCARD_ILSEQ, &one); /* current locale -> UTF-8 */ locale2utf8 = iconv_open("UTF-8", locale); @@@@ -104,7 +90,6 @@@@ obexapp_util_locale_init(void) } iconv(locale2utf8, NULL, NULL, NULL, NULL); - iconvctl(locale2utf8, ICONV_SET_DISCARD_ILSEQ, &one); /* UTF-16BE -> current locale */ utf16be2locale = iconv_open(locale, "UTF-16BE"); @@@@ -114,7 +99,6 @@@@ obexapp_util_locale_init(void) } iconv(utf16be2locale, NULL, NULL, NULL, NULL); - iconvctl(utf16be2locale, ICONV_SET_DISCARD_ILSEQ, &one); /* current locale -> UTF-16BE */ locale2utf16be = iconv_open("UTF-16BE", locale); @@@@ -124,7 +108,6 @@@@ obexapp_util_locale_init(void) } iconv(locale2utf16be, NULL, NULL, NULL, NULL); - iconvctl(locale2utf16be, ICONV_SET_DISCARD_ILSEQ, &one); return (0); } @ 1.3 log @update obexapp to version 1.4.7, which contains compiler warning fixes and NetBSD compatibility in the source. ok by xtraeme@@ @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.2 2006/07/09 16:35:31 xtraeme Exp $ d3 1 a3 1 --- util.c.orig 2007-05-21 19:57:51.000000000 +0100 d16 69 @ 1.2 log @Clean up previous patches for NetBSD bluetooth support. IMHO I can send them to the author now. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- util.c.orig 2006-07-02 20:07:59.000000000 +0200 +++ util.c 2006-07-02 20:08:07.000000000 +0200 @@@@ -30,7 +30,7 @@@@ a9 1 +#include d12 1 d14 2 @ 1.1 log @Initial revision @ text @d3 4 a6 13 --- sdp.c.orig 2006-07-02 19:51:38.000000000 +0200 +++ sdp.c 2006-07-02 19:52:05.000000000 +0200 @@@@ -72,7 +72,11 @@@@ u_int32_t type, len; if (local == NULL) +#ifdef __NetBSD__ + local = BDADDR_ANY; +#else local = NG_HCI_BDADDR_ANY; +#endif if (remote == NULL || channel == NULL) rfcomm_channel_lookup_exit(EINVAL); d8 6 @ 1.1.1.1 log @Initial import of obexapp-1.4.4. An obex application to transfer objects (address book items, images, movies, anything the target can handle) to mobile devices via IrDA, Bluetooth and other protocol via the OBEX format. xtraeme: now it should be possible to transfer files from/to my cellular phone from NetBSD. @ text @@