head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.158 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.156 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.154 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.152 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.150 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.148 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.146 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.144 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.142 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.140 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.138 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.136 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.134 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.132 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.130 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.128 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.126 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.124 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.122 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.120 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.118 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.116 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.114 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.110 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.90 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.112 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.108 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.106 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.104 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.102 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.100 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.98 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.96 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.94 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.92 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.88 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.86 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.84 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.82 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.80 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.78 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.76 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.74 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.72 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.70 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.68 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.66 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.64 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.62 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.60 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.58 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.56 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.54 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.52 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.50 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.48 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.46 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.44 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.42 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.40 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.38 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.36 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.34 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.32 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.30 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.28 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.26 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.24 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.22 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.20 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.18 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.16 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.14 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.12 pkgsrc-2008Q1:1.1.0.10 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.8 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.6 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.4 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.2 pkgsrc-2007Q1-base:1.1; locks; strict; comment @# @; 1.1 date 2007.01.26.01.50.54; author markd; state Exp; branches; next ; desc @@ 1.1 log @Update malsync to 2.2.0 and apply patches from Antoine Jacoutot to build against pilot-link 0.12.x. @ text @$NetBSD$ --- malsync.c.orig 2007-01-23 00:37:31.000000000 +1300 +++ malsync.c @@@@ -100,8 +100,7 @@@@ typedef struct { int pilot_rHandle; int pilot_RecIndex; recordid_t id; - uint8 *pilot_buffer; - int pilot_buffer_size; + pi_buffer_t *pi_buf; /* Secure Network Library Stuff */ AGBool hasseclib; @@@@ -266,8 +265,8 @@@@ syncInfoFree(PalmSyncInfo * pInfo) if (NULL != pInfo->userConfig) AGUserConfigFree(pInfo->userConfig); - if (NULL != pInfo->pilot_buffer) - free(pInfo->pilot_buffer); + if (NULL != pInfo->pi_buf) + pi_buffer_free (pInfo->pi_buf); if (NULL != pInfo->commandProcessor) AGCommandProcessorFree(pInfo->commandProcessor); @@@@ -290,9 +289,8 @@@@ syncInfoNew() bzero(pInfo, sizeof(PalmSyncInfo)); - pInfo->pilot_buffer_size = pbs; - pInfo->pilot_buffer = (uint8 *)malloc(pbs); - if (NULL == pInfo->pilot_buffer) + pInfo->pi_buf = pi_buffer_new (pbs); + if (NULL == pInfo->pi_buf) goto fail; /* Allocate the platform calls record. */ @@@@ -341,8 +339,7 @@@@ int16 readInt16(uint8 * p) /*---------------------------------------------------------------------------*/ static void readAndUseDeviceInfoDatabase(AGDeviceInfo * devInfo, - uint8 *dev_db_info_buffer, - uint32 dev_db_info_buffer_size) + pi_buffer_t *pi_buf) { int database_id = 0; long result; @@@@ -373,13 +370,13 @@@@ readAndUseDeviceInfoDatabase(AGDeviceInf int rc; rc = dlp_ReadRecordByIndex(sd, database_id, 0, - (void *)dev_db_info_buffer, - &id, &dev_db_info_buffer_size, + pi_buf, + &id, &attr, &cat); if (rc >= 0) { - uint8 *p = dev_db_info_buffer; + uint8 *p = pi_buf->data; int16 dev_db_info_version = readInt16(p); p+=sizeof(int16); devInfo->colorDepth = readInt32(p); @@@@ -472,8 +469,7 @@@@ readDeviceInfo(PalmSyncInfo * pInfo) } readAndUseDeviceInfoDatabase(devInfo, - pInfo->pilot_buffer, - pInfo->pilot_buffer_size); + pInfo->pi_buf); /* Override the color depth if the user wants low res images. */ if (lowres) { @@@@ -663,31 +659,36 @@@@ static int32 readDeviceUserConfig32(int userConfigDBHandle, AGUserConfig **deviceUserConfig) { recordid_t id; - int bufferSize = BUFFERSIZE; + pi_buffer_t *pi_buf; int attr = 0; int cat = 0; int rc; - uint8 buffer[BUFFERSIZE]; AGBufferReader * r = NULL; - rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, - &id, &bufferSize, &attr, &cat); + pi_buf = pi_buffer_new (BUFFERSIZE); + + rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, pi_buf, + &id, &attr, &cat); if (rc < 0) { if (verbose) printf("readDeviceUserConfig: dlp_ReadRecordByIndex , err = %d\n", rc); + pi_buffer_free (pi_buf); return 0; } - r = AGBufferReaderNew(buffer); + r = AGBufferReaderNew(pi_buf->data); if (r) { *deviceUserConfig = AGUserConfigNew(); AGUserConfigReadData(*deviceUserConfig, (AGReader*)r); AGBufferReaderFree(r); + pi_buffer_free (pi_buf); return id; - } else + } else { + pi_buffer_free (pi_buf); return 0; + } } #define BUFFERSIZE 0xFFFF /*---------------------------------------------------------------------------*/ @@@@ -695,31 +696,36 @@@@ static int32 readDeviceUserConfig31(int AGUserConfig **deviceUserConfig) { recordid_t id; - int bufferSize = BUFFERSIZE; int attr = 0; int cat = 0; int rc; - uint8 buffer[BUFFERSIZE]; + pi_buffer_t *pi_buf; AGBufferReader * r = NULL; - rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, - &id, &bufferSize, &attr, &cat); + pi_buf = pi_buffer_new (BUFFERSIZE); + + rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, pi_buf, + &id, &attr, &cat); if (rc < 0) { if (verbose) printf("readDeviceUserConfig: dlp_ReadRecordByIndex , err = %d\n", rc); + pi_buffer_free (pi_buf); return 0; } - r = AGBufferReaderNew(buffer); + r = AGBufferReaderNew(pi_buf->data); if (r) { *deviceUserConfig = AGUserConfigNew(); MAL31ReadUserData(*deviceUserConfig, (AGReader*)r); AGBufferReaderFree(r); + pi_buffer_free (pi_buf); return id; - } else + } else { + pi_buffer_free (pi_buf); return 0; + } } /*---------------------------------------------------------------------------*/ static int32 readDeviceUserConfig(int userConfigDBHandle, @@@@ -740,23 +746,25 @@@@ static void writeDeviceUserConfig(int us { recordid_t id; - int bufferSize = BUFFERSIZE; int attr = 0; int cat = 0; - uint8 buffer[BUFFERSIZE]; AGBufferWriter * w = NULL; + w = AGBufferWriterNew(0); if (w) { long result; + pi_buffer_t *pi_buf; + pi_buf = pi_buffer_new (BUFFERSIZE); + if (threeone) { MAL31WriteUserData(deviceUserConfig, (AGWriter*)w); } else { AGUserConfigWriteData(deviceUserConfig, (AGWriter*)w); } - result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, - &id, &bufferSize, &attr, &cat); + result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, pi_buf, + &id, &attr, &cat); if (result < 0) id = 0; @@@@ -766,7 +774,7 @@@@ static void writeDeviceUserConfig(int us AGBufferWriterGetBufferSize(w), &id); AGBufferWriterFree(w); - + pi_buffer_free (pi_buf); } } @@@@ -1044,17 +1052,17 @@@@ getRecordBase(PalmSyncInfo * pInfo, AGBo int32 result; int att = 0; int cat = 0; - int size = pInfo->pilot_buffer_size; + //int size = pInfo->pi_buf->allocated; int idx = pInfo->pilot_RecIndex++; result = (modonly) ? - dlp_ReadNextModifiedRec (sd, pInfo->pilot_rHandle, pInfo->pilot_buffer, + dlp_ReadNextModifiedRec (sd, pInfo->pilot_rHandle, pInfo->pi_buf, &pInfo->id, &idx, - &size, &att, &cat) + &att, &cat) : dlp_ReadRecordByIndex(sd, pInfo->pilot_rHandle, idx, - pInfo->pilot_buffer, &pInfo->id, - &size, &att, &cat); + pInfo->pi_buf, &pInfo->id, + &att, &cat); if (result < 0) { closeDatabase(pInfo); @@@@ -1070,7 +1078,7 @@@@ getRecordBase(PalmSyncInfo * pInfo, AGBo } pInfo->record = AGRecordInit(pInfo->record, pInfo->id, AGPalmPilotAttribsToMALMod((uint8)att), - size, pInfo->pilot_buffer, 0, NULL); + pInfo->pi_buf->used, pInfo->pi_buf->data, 0, NULL); *record = pInfo->record; return AGCLIENT_CONTINUE; @@@@ -1363,7 +1371,6 @@@@ main(int argc, char *argv[]) static void Connect(PalmSyncInfo *pi) { - struct pi_sockaddr addr; int ret; if (sd != 0) @@@@ -1609,7 +1616,6 @@@@ fill_in_versioninfo(int sd, AGExpansionV 0, (void *)version_buffer, &id, - &version_buffer_size, &attr, &cat); @