File: 01_sanei_update.dpatch

package info (click to toggle)
sane-frontends 1.0.13-2
  • links: PTS
  • area: main
  • in suites: sarge
  • size: 1,140 kB
  • ctags: 719
  • sloc: ansic: 9,549; sh: 4,207; makefile: 521
file content (1685 lines) | stat: -rw-r--r-- 48,464 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_sanei_update.dpatch by  <jblache@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Update sanei from sane-backends 1.0.15

@DPATCH@
diff -urNad sane-frontends-1.0.13/include/sane/sanei.h /tmp/dpep.TALHag/sane-frontends-1.0.13/include/sane/sanei.h
--- sane-frontends-1.0.13/include/sane/sanei.h	2000-11-10 07:19:02.000000000 +0100
+++ /tmp/dpep.TALHag/sane-frontends-1.0.13/include/sane/sanei.h	2004-12-09 15:42:22.000000000 +0100
@@ -1,5 +1,7 @@
 /* sane - Scanner Access Now Easy.
    Copyright (C) 1996 David Mosberger-Tang and Andreas Beck
+   Copyright (C) 2002, 2003 Henning Meier-Geinitz
+
    This file is part of the SANE package.
 
    SANE is free software; you can redistribute it and/or modify it
@@ -16,26 +18,155 @@
    along with sane; see the file COPYING.  If not, write to the Free
    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-   This file declares SANE internal routines that are provided to
-   simplify backend implementation.  */
+   As a special exception, the authors of SANE give permission for
+   additional uses of the libraries contained in this release of SANE.
+   
+   The exception is that, if you link a SANE library with other files
+   to produce an executable, this does not by itself cause the
+   resulting executable to be covered by the GNU General Public
+   License.  Your use of that executable is in no way restricted on
+   account of linking the SANE library code into it.
+   
+   This exception does not, however, invalidate any other reasons why
+   the executable file might be covered by the GNU General Public
+   License.
+   
+   If you submit changes to SANE to the maintainers to be included in
+   a subsequent release, you agree by submitting the changes that
+   those changes may be distributed with this exception intact.
+   
+   If you write modifications of your own for SANE, it is your choice
+   whether to permit this exception to apply to your modifications.
+   If you do not wish that, delete this exception notice. 
+*/
+
+/** @file sanei.h
+ * Convenience macros and function declarations for backends
+ * @sa sanei_backend.h sanei_thread.h
+ */
+
+/* Doxygen documentation */
+
+/** @mainpage SANEI (SANE internal routines) documentation
+ *
+ * @image html ../images/sane-logo2.jpg
+ * @section intro Introduction
+ *
+ * The header files in the include/sane/ directory named sanei_*.h provide
+ * function declarations and macros that can be used by every SANE backend.
+ * Their implementations can be found in the sanei/ directory. The code aims
+ * to be platform-independent to avoid lots of \#ifdef code in the backends.
+ * Please use the SANEI functions wherever possible.
+ *
+ * This documentation was created by the use of doxygen, the 
+ * doc/doxygen-sanei.conf configuration file and dcoumentation in the sanei_*.h
+ * files.
+ *
+ * This documenation is far from complete. Any help is appreciated.
+ *
+ * @section additional Additional documentation
+ * - The SANE standard can be found at <a 
+ *   href="http://www.sane-project.org/html/">the SANE webserver</a>.
+ * - Information on how to write a backend: <a
+ *   href="../backend-writing.txt">backend-writing.txt</a>.
+ * - General SANE documentation is on <a
+ *   href="http://www.sane-project.org/docs.html>the SANE documentation
+ *   page</a>.
+ * 
+ * @section contact Contact 
+ *
+ * The common way to contact the developers of SANE is the sane-devel
+ * mailing list. See the <a
+ * href="http://www.sane-project.org/mailing-lists.html">mailing list webpage</a>
+ * for details. That's the place to ask questions, report bugs, or announce
+ * a new backend.
+ * 
+ */
 
 #ifndef sanei_h
 #define sanei_h
 
 #include <sane/sane.h>
 
+/** @name Public macros and functions
+ * @{
+ */
+/** @def STRINGIFY(x)
+ * Turn parameter into string.
+ */
+/** @def PASTE(x,y)
+ * Concatenate parameters.
+ *
+ */
+/** @def NELEMS(a)
+ * Return number of elements of an array.
+ *
+ */
+
+/** @fn extern SANE_Status sanei_check_value (const SANE_Option_Descriptor * opt, void * value);
+ * Check the constraints of a SANE option.
+ *
+ * @param opt   option to check
+ * @param value value of the option
+ *
+ * @return 
+ * - SANE_STATUS_GOOD     - on success
+ * - SANE_STATUS_INVAL    - if the value doesn't fit inside the constraint
+ *   or any other error occured
+ * @sa sanei_constrain_value()
+ */
+
+/** @fn extern SANE_Status sanei_constrain_value (const SANE_Option_Descriptor * opt, void * value, SANE_Word * info);
+ * Check the constraints of a SANE option and adjust its value if necessary.
+ *
+ * Depending on the type of the option and constraint, value is modified
+ * to fit inside constraint.
+ *
+ * @param opt   option to check
+ * @param value value of the option
+ * @param info  info is set to SANE_INFO_INEXACT if value was changed
+ *
+ * @return 
+ * - SANE_STATUS_GOOD     - on success
+ * - SANE_STATUS_INVAL    - if the function wasn't able to fit value into the
+ *   constraint or any other error occured
+ * @sa sanei_check_value()
+ */
+
+/* @} */
+
+/** @name Private macros
+ * @{
+ */
+/** @def STRINGIFY1(x)
+ * Internal use only.
+ */
+/** @def PASTE1(x,y)
+ * Internal use only.
+ */
+/* @} */
+
 /* A few convenience macros:  */
+/** @hideinitializer */
+#define NELEMS(a)	((int)(sizeof (a) / sizeof (a[0])))
 
+/** @hideinitializer */
 #define STRINGIFY1(x)	#x
+/** @hideinitializer */
 #define STRINGIFY(x)	STRINGIFY1(x)
 
+/** @hideinitializer */
 #define PASTE1(x,y)	x##y
+/** @hideinitializer */
 #define PASTE(x,y)	PASTE1(x,y)
 
-#define NELEMS(a)	((int)(sizeof (a) / sizeof (a[0])))
+extern SANE_Status sanei_check_value (const SANE_Option_Descriptor * opt,
+				      void * value);
 
 extern SANE_Status sanei_constrain_value (const SANE_Option_Descriptor * opt,
 					  void * value, SANE_Word * info);
+
+
 extern int sanei_save_values (int fd, SANE_Handle device);
 extern int sanei_load_values (int fd, SANE_Handle device);
 
diff -urNad sane-frontends-1.0.13/include/sane/sanei_codec_ascii.h /tmp/dpep.TALHag/sane-frontends-1.0.13/include/sane/sanei_codec_ascii.h
--- sane-frontends-1.0.13/include/sane/sanei_codec_ascii.h	2000-11-10 07:19:03.000000000 +0100
+++ /tmp/dpep.TALHag/sane-frontends-1.0.13/include/sane/sanei_codec_ascii.h	2004-12-09 15:42:23.000000000 +0100
@@ -16,11 +16,47 @@
    along with sane; see the file COPYING.  If not, write to the Free
    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-   This file declares SANE application interface.  See the SANE
-   standard for a detailed explanation of the interface.  */
+   As a special exception, the authors of SANE give permission for
+   additional uses of the libraries contained in this release of SANE.
+
+   The exception is that, if you link a SANE library with other files
+   to produce an executable, this does not by itself cause the
+   resulting executable to be covered by the GNU General Public
+   License.  Your use of that executable is in no way restricted on
+   account of linking the SANE library code into it.
+
+   This exception does not, however, invalidate any other reasons why
+   the executable file might be covered by the GNU General Public
+   License.
+
+   If you submit changes to SANE to the maintainers to be included in
+   a subsequent release, you agree by submitting the changes that
+   those changes may be distributed with this exception intact.
+
+   If you write modifications of your own for SANE, it is your choice
+   whether to permit this exception to apply to your modifications.
+   If you do not wish that, delete this exception notice.
+*/
+
+/** @file sanei_codec_ascii.h
+ * ASCII codec for network and file transmissions
+ *
+ * Instead translating data to a byte stream this codec uses ASCII hex numbers.
+ * Therefore it can be used for streams that are not 8-bit clean or which can
+ * only use printable characters. It's currently used for saving/restoring
+ * data to/from disk.
+ *
+ * @sa sanei_codec_bin.h sanei_net.h sanei_wire.h
+ */
 #ifndef sanei_codec_ascii_h
 #define sanei_codec_ascii_h
 
+/** Initialize the ascii codec
+ *
+ * Set the i/o functions of the Wire to those of the ASCII codec.
+ *
+ * @param w Wire
+ */
 extern void sanei_codec_ascii_init (Wire *w);
 
 #endif /* sanei_codec_ascii_h */
diff -urNad sane-frontends-1.0.13/include/sane/sanei_codec_bin.h /tmp/dpep.TALHag/sane-frontends-1.0.13/include/sane/sanei_codec_bin.h
--- sane-frontends-1.0.13/include/sane/sanei_codec_bin.h	2000-11-10 07:19:03.000000000 +0100
+++ /tmp/dpep.TALHag/sane-frontends-1.0.13/include/sane/sanei_codec_bin.h	2004-12-09 15:42:24.000000000 +0100
@@ -16,11 +16,46 @@
    along with sane; see the file COPYING.  If not, write to the Free
    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-   This file declares SANE application interface.  See the SANE
-   standard for a detailed explanation of the interface.  */
+   As a special exception, the authors of SANE give permission for
+   additional uses of the libraries contained in this release of SANE.
+
+   The exception is that, if you link a SANE library with other files
+   to produce an executable, this does not by itself cause the
+   resulting executable to be covered by the GNU General Public
+   License.  Your use of that executable is in no way restricted on
+   account of linking the SANE library code into it.
+
+   This exception does not, however, invalidate any other reasons why
+   the executable file might be covered by the GNU General Public
+   License.
+
+   If you submit changes to SANE to the maintainers to be included in
+   a subsequent release, you agree by submitting the changes that
+   those changes may be distributed with this exception intact.
+
+   If you write modifications of your own for SANE, it is your choice
+   whether to permit this exception to apply to your modifications.
+   If you do not wish that, delete this exception notice.
+*/
+
+/** @file sanei_codec_bin.h
+ * Binary codec for network transmissions
+ *
+ * Transtale data to a byte stream while taking byte order problems into
+ * account. This codec is currently used for saned and the network backend.
+ *
+ * @sa sanei_codec_ascii.h sanei_net.h sanei_wire.h
+ */
+
 #ifndef sanei_codec_bin_h
 #define sanei_codec_bin_h
 
+/** Initialize the binary codec
+ *
+ * Set the i/o functions of the Wire to those of the binary codec.
+ *
+ * @param w Wire
+ */
 extern void sanei_codec_bin_init (Wire *w);
 
 #endif /* sanei_codec_bin_h */
diff -urNad sane-frontends-1.0.13/include/sane/sanei_debug.h /tmp/dpep.TALHag/sane-frontends-1.0.13/include/sane/sanei_debug.h
--- sane-frontends-1.0.13/include/sane/sanei_debug.h	2000-11-10 07:19:03.000000000 +0100
+++ /tmp/dpep.TALHag/sane-frontends-1.0.13/include/sane/sanei_debug.h	2004-12-09 15:42:25.000000000 +0100
@@ -1,28 +1,95 @@
+/** @file sanei_debug.h
+ * Support for printing debug messages.
+ *
+ * Use the functions of this header file to print debug or warning messages.
+ */
+
 #ifndef _SANEI_DEBUG_H
 #define _SANEI_DEBUG_H
 
 #include <sane/sanei.h>
 
-/* this header file defines:
+/** @name Public macros
+ * These macros can be used in backends and other SANE-related
+ * code.
  *
- * DBG_INIT() 		 - should be called before any other debug function
- * DBG(level, fmt, ...)	 - prints a message at debug level `level' or higher
- * 			   using a printf-like function
- * IF_DBG(x)             - expands to x if debug support is enabled at
- * 			   compile-time, if NDEBUG is defined at compile-time
- * 			   this macro expands to nothing
+ * Before including sanei_debug.h, the following macros must be set:
  *
- * ENTRY(name)		 - expands to sane_BACKEND_NAME_name
+ * - BACKEND_NAME - The name of your backend without double-quotes (must be set in any case)
+ * - STUBS - If this is defined, no macros will be included. Used in 
+ *   backends consisting of more than one .c file.
+ * - DEBUG_DECLARE_ONLY - Generates prototypes instead of functions. Used in 
+ *   backends consisting of more than one .c file.
+ * - DEBUG_NOT_STATIC - Doesn't generate static functions. Used in header files if
+ *   they are include in more than one .c file.
  *
- * before you include sanei_debug.h, you'll have to define
+ * @{ 
+ */
+
+/** @def DBG_INIT()
+ * Initialize sanei_debug.
  *
- * BACKEND_NAME		 - the name of your backend without double-quotes
- * STUBS                 - if this is defined, nothing will happen
- * DEBUG_DECLARE_ONLY    - generate prototypes instead of functions
- * DEBUG_NOT_STATIC	 - doesn't generate static functions
+ * Call this function before you use any DBG function.
+ */
+
+/** @def DBG(level, fmt, ...)
+ * Print a message at debug level `level' or higher using a printf-like
+ * function. Example: DBG(1, "sane_open: opening fd \%d\\n", fd).
+ *
+ * @param level debug level
+ * @param fmt format (see man 3 printf for details)
+ * @param ... additional arguments
+ */
+
+/** @def IF_DBG(x)
+ * Compile code only if debugging is enabled.
+ *
+ * Expands to x if debug support is enabled at compile-time. If NDEBUG is 
+ * defined at compile-time this macro expands to nothing.
  *
+ * @param x code to expand when debugging is enabled
  */
 
+/**
+ * @def DBG_LEVEL
+ * Current debug level. 
+ *
+ * You can only read this "variable".
+ */
+
+/** @def ENTRY(name)
+ * Expands to sane_BACKEND_NAME_name.
+ *
+ * Example: ENTRY(init) in mustek.c will expand to sane_mustek_init.
+ */
+
+/* @} */
+
+/** @name Internal macros and functions
+ * Do not use in your own code.
+ * @{
+ */
+
+/** @def DBG_LOCAL
+ * Do not use in backends directly.
+ *
+ * Internal wrapper for printing function.
+ */
+
+/** @fn extern void sanei_init_debug (const char * backend, int * debug_level_var);
+ * Do not use in backends directly.
+ *
+ * Actual init function.
+ */
+
+/** @fn extern void sanei_debug_msg (int level, int max_level, const char *be, const char *fmt, va_list ap);
+ * Do not use in backends directly.
+ *
+ * Actual printing function.
+ */
+/* @} */
+
+                                  /** @hideinitializer*/
 #define ENTRY(name)     PASTE(PASTE(PASTE(sane_,BACKEND_NAME),_),name)
 
 #ifdef NDEBUG
@@ -36,6 +103,7 @@
 	
 #else /* !NDEBUG */
 	
+                                  /** @hideinitializer*/
 # define DBG_LEVEL      PASTE(sanei_debug_,BACKEND_NAME)
 
 # if defined(BACKEND_NAME) && !defined(STUBS)
@@ -46,9 +114,11 @@
 #  endif /* DEBUG_DECLARE_ONLY */
 # endif /* BACKEND_NAME && !STUBS */
 
+                                  /** @hideinitializer*/
 # define DBG_INIT()                                     \
   sanei_init_debug (STRINGIFY(BACKEND_NAME), &DBG_LEVEL)
 
+                                  /** @hideinitializer*/
 # define DBG_LOCAL	PASTE(DBG_LEVEL,_call)
 
 
@@ -56,7 +126,11 @@
 
 #  ifdef DEBUG_DECLARE_ONLY
 
-extern void DBG_LOCAL (int level, const char *msg, ...);
+extern void DBG_LOCAL (int level, const char *msg, ...) 
+#ifdef __GNUC__
+__attribute__ ((format (printf, 2, 3)))
+#endif
+;
 
 #  else /* !DEBUG_DECLARE_ONLY */
 
@@ -65,6 +139,13 @@
 extern void sanei_debug_msg 
   (int level, int max_level, const char *be, const char *fmt, va_list ap);
 
+#ifdef __GNUC__
+#   ifndef DEBUG_NOT_STATIC
+static
+#   endif /* !DEBUG_NOT_STATIC */
+void DBG_LOCAL (int level, const char *msg, ...) __attribute__ ((format (printf, 2, 3)));
+#endif /* __GNUC__ */
+
 #   ifndef DEBUG_NOT_STATIC
 static
 #   endif /* !DEBUG_NOT_STATIC */
@@ -78,14 +159,16 @@
   va_end (ap);
 }
 
-#  endif /* DEBUG_NOT_STATIC */
+#  endif /* DEBUG_DECLARE_ONLY */
 
 # endif /* !STUBS */
 
+                                  /** @hideinitializer*/
 # define DBG            DBG_LOCAL
 
 extern void sanei_init_debug (const char * backend, int * debug_level_var);
   
+                                  /** @hideinitializer*/
 # define IF_DBG(x)      x
 
 #endif /* NDEBUG */
diff -urNad sane-frontends-1.0.13/include/sane/sanei_wire.h /tmp/dpep.TALHag/sane-frontends-1.0.13/include/sane/sanei_wire.h
--- sane-frontends-1.0.13/include/sane/sanei_wire.h	2000-11-10 07:19:04.000000000 +0100
+++ /tmp/dpep.TALHag/sane-frontends-1.0.13/include/sane/sanei_wire.h	2004-12-09 15:42:26.000000000 +0100
@@ -16,6 +16,27 @@
    along with sane; see the file COPYING.  If not, write to the Free
    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+   As a special exception, the authors of SANE give permission for
+   additional uses of the libraries contained in this release of SANE.
+
+   The exception is that, if you link a SANE library with other files
+   to produce an executable, this does not by itself cause the
+   resulting executable to be covered by the GNU General Public
+   License.  Your use of that executable is in no way restricted on
+   account of linking the SANE library code into it.
+
+   This exception does not, however, invalidate any other reasons why
+   the executable file might be covered by the GNU General Public
+   License.
+
+   If you submit changes to SANE to the maintainers to be included in
+   a subsequent release, you agree by submitting the changes that
+   those changes may be distributed with this exception intact.
+
+   If you write modifications of your own for SANE, it is your choice
+   whether to permit this exception to apply to your modifications.
+   If you do not wish that, delete this exception notice.
+
    Support routines to translate internal datatypes into a wire-format
    (used for RPCs and to save/restore options).  */
 
@@ -24,6 +45,8 @@
 
 #include <sys/types.h>
 
+#define MAX_MEM (1024 * 1024)
+
 typedef enum
   {
     WIRE_ENCODE = 0,
@@ -43,6 +66,7 @@
     int version;		/* protocol version in use */
     WireDirection direction;
     int status;
+    int allocated_memory;
     struct
       {
 	WireCodecFunc w_byte;
@@ -70,11 +94,15 @@
 Wire;
 
 extern void sanei_w_init (Wire *w, void (*codec_init)(Wire *));
+extern void sanei_w_exit (Wire *w);
 extern void sanei_w_space (Wire *w, size_t howmuch);
 extern void sanei_w_void (Wire *w);
 extern void sanei_w_byte (Wire *w, SANE_Byte *v);
 extern void sanei_w_char (Wire *w, SANE_Char *v);
 extern void sanei_w_word (Wire *w, SANE_Word *v);
+extern void sanei_w_bool (Wire *w, SANE_Bool *v);
+extern void sanei_w_ptr (Wire *w, void **v, WireCodecFunc w_value,
+                         size_t value_size);
 extern void sanei_w_string (Wire *w, SANE_String *v);
 extern void sanei_w_status (Wire *w, SANE_Status *v);
 extern void sanei_w_constraint_type (Wire *w, SANE_Constraint_Type *v);
diff -urNad sane-frontends-1.0.13/sanei/sanei_codec_bin.c /tmp/dpep.TALHag/sane-frontends-1.0.13/sanei/sanei_codec_bin.c
--- sane-frontends-1.0.13/sanei/sanei_codec_bin.c	2001-05-27 21:43:14.000000000 +0200
+++ /tmp/dpep.TALHag/sane-frontends-1.0.13/sanei/sanei_codec_bin.c	2004-12-09 15:41:54.000000000 +0100
@@ -54,6 +54,9 @@
   SANE_Byte *b = v;
 
   sanei_w_space (w, 1);
+  if (w->status)
+    return;
+
   switch (w->direction)
     {
     case WIRE_ENCODE:
@@ -82,8 +85,14 @@
 	len = strlen (*s) + 1;
     }
   sanei_w_array (w, &len, v, w->codec.w_byte, 1);
-  if (w->direction == WIRE_DECODE && !len)
-    *s = 0;
+
+  if (w->direction == WIRE_DECODE)
+    {
+      if (len == 0)
+	*s = 0;
+      else if (w->status == 0)
+	*(*s + len - 1) = '\0';
+    }
 }
 
 static void
@@ -92,6 +101,8 @@
   SANE_Word val, *word = v;
 
   sanei_w_space (w, 4);
+  if (w->status)
+    return;
   switch (w->direction)
     {
     case WIRE_ENCODE:
diff -urNad sane-frontends-1.0.13/sanei/sanei_thread.c /tmp/dpep.TALHag/sane-frontends-1.0.13/sanei/sanei_thread.c
--- sane-frontends-1.0.13/sanei/sanei_thread.c	2000-11-10 07:33:20.000000000 +0100
+++ /tmp/dpep.TALHag/sane-frontends-1.0.13/sanei/sanei_thread.c	2004-12-09 15:41:59.000000000 +0100
@@ -1,5 +1,6 @@
 /* sane - Scanner Access Now Easy.
-   Copyright (C) 2000 Yuri Dario
+   Copyright (C) 1998-2001 Yuri Dario
+   Copyright (C) 2003-2004 Gerhard Jaeger (pthread/process support)
    This file is part of the SANE package.
 
    This program is free software; you can redistribute it and/or
@@ -37,72 +38,388 @@
    If you write modifications of your own for SANE, it is your choice
    whether to permit this exception to apply to your modifications.
    If you do not wish that, delete this exception notice.
+
+   OS/2
+   Helper functions for the OS/2 port (using threads instead of forked
+   processes). Don't use them in the backends, they are used automatically by
+   macros.
+
+   Other OS:
+   use this lib, if you intend to let run your reader function within its own
+   task (thread or process). Depending on the OS and/or the configure settings
+   pthread or fork is used to achieve this goal.
 */
 
 #include "sane/config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <errno.h>
 #include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-
 #ifdef HAVE_OS2_H
-#define INCL_DOSPROCESS
-#include <os2.h>
+# define INCL_DOSPROCESS
+# include <os2.h>
 #endif
+#if !defined USE_PTHREAD && !defined HAVE_OS2_H
+# include <sys/wait.h>
+#endif
+#if defined USE_PTHREAD
+# include <pthread.h>
+#endif
+
+#define BACKEND_NAME sanei_thread      /**< name of this module for debugging */
 
+#include <sane/sane.h>
+#include "../include/sane/sanei_debug.h"
 #include "../include/sane/sanei_thread.h"
 
+#ifndef _VAR_NOT_USED
+# define _VAR_NOT_USED(x)	((x)=(x))
+#endif
+
+typedef struct {
+
+	int         (*func)( void* );
+	SANE_Status  status;
+	void        *func_data;
+
+} ThreadDataDef, *pThreadDataDef;
+
+static ThreadDataDef td;
+
+/** for init issues - here only for the debug output
+ */
+void
+sanei_thread_init( void )
+{
+	DBG_INIT();
+
+	memset( &td, 0, sizeof(ThreadDataDef));
+	td.status = SANE_STATUS_GOOD;
+}
+
+SANE_Bool
+sanei_thread_is_forked( void )
+{
+#if defined USE_PTHREAD || defined HAVE_OS2_H
+	return SANE_FALSE;
+#else
+	return SANE_TRUE;
+#endif
+}
+
+int
+sanei_thread_kill( int pid )
+{
+	DBG(2, "sanei_thread_kill() will kill %d\n", (int)pid);
+#ifdef USE_PTHREAD
+#if defined (__APPLE__) && defined (__MACH__)
+	return pthread_kill((pthread_t)pid, SIGUSR2);
+#else
+	return pthread_cancel((pthread_t)pid);
+#endif
+#elif defined HAVE_OS2_H
+	return DosKillThread(pid);
+#else
+	return kill( pid, SIGTERM );
+#endif
+}
+
+#ifdef HAVE_OS2_H
+
+static void
+local_thread( void *arg )
+{
+	pThreadDataDef ltd = (pThreadDataDef)arg;
+
+	DBG( 2, "thread started, calling func() now...\n" );
+	ltd->status = ltd->func( ltd->func_data );
+
+	DBG( 2, "func() done - status = %d\n", ltd->status );
+	_endthread();
+}
+
 /*
  * starts a new thread or process
  * parameters:
- * start        address of reader function
- * arg_list     pointer to scanner data structure
+ * star  address of reader function
+ * args  pointer to scanner data structure
  *
-*/
+ */
 int
-sanei_thread_begin( void (*start)(void *arg),
-                    void *arg_list)
+sanei_thread_begin( int (*func)(void *args), void* args )
 {
-#ifdef HAVE_OS2_H
-   return _beginthread( start, NULL, 64*1024, arg_list);
+	int           pid;
+
+	td.func      = func;
+	td.func_data = args;
+
+	pid = _beginthread( local_thread, NULL, 1024*1024, (void*)&td );
+	if ( pid == -1 ) {
+		DBG( 1, "_beginthread() failed\n" );
+		return -1;
+	}
+   
+	DBG( 2, "_beginthread() created thread %d\n", pid );
+	return pid;
+}
+
+int
+sanei_thread_waitpid( int pid, int *status )
+{
+  if (status)
+    *status = 0;
+  return pid; /* DosWaitThread( (TID*) &pid, DCWW_WAIT);*/
+}
+
+int
+sanei_thread_sendsig( int pid, int sig )
+{
+	return 0;
+}
+
+#else /* HAVE_OS2_H */
+
+#ifdef USE_PTHREAD
+
+/* seems to be undefined in MacOS X */
+#ifndef PTHREAD_CANCELED
+# define PTHREAD_CANCELED ((void *) -1)
+#endif
+
+/**
+ */
+#if defined (__APPLE__) && defined (__MACH__)
+static void
+thread_exit_handler( int signo )
+{
+	DBG( 2, "signal(%i) caught, calling pthread_exit now...\n", signo );
+	pthread_exit( PTHREAD_CANCELED );
+}
+#endif
+
+
+static void*
+local_thread( void *arg )
+{
+	static int     status;
+	pThreadDataDef ltd = (pThreadDataDef)arg;
+
+#if defined (__APPLE__) && defined (__MACH__)
+	struct sigaction act;
+
+	sigemptyset(&(act.sa_mask));
+	act.sa_flags   = 0;
+	act.sa_handler = thread_exit_handler;
+	sigaction( SIGUSR2, &act, 0 );
 #else
-   return fork();
+	int old;
+
+	pthread_setcancelstate( PTHREAD_CANCEL_ENABLE, &old );
+	pthread_setcanceltype ( PTHREAD_CANCEL_ASYNCHRONOUS, &old );
 #endif
+
+	DBG( 2, "thread started, calling func() now...\n" );
+
+	status = ltd->func( ltd->func_data );
+
+	/* so sanei_thread_get_status() will work correctly... */
+	ltd->status = status;
+
+	DBG( 2, "func() done - status = %d\n", status );
+
+	/* return the status, so pthread_join is able to get it*/
+	pthread_exit((void*)&status );
+}
+
+/**
+ */
+static void
+restore_sigpipe( void )
+{
+	struct sigaction act;
+
+	if( sigaction( SIGPIPE, NULL, &act ) == 0 ) {
+
+		if( act.sa_handler == SIG_IGN ) {
+			sigemptyset( &act.sa_mask );
+			act.sa_flags   = 0;
+			act.sa_handler = SIG_DFL;
+			
+			DBG( 2, "restoring SIGPIPE to SIG_DFL\n" );
+			sigaction( SIGPIPE, &act, NULL );
+		}
+	}
 }
 
+#else /* the process stuff */
+
+static int
+eval_wp_result( int pid, int wpres, int pf )
+{
+	int retval = SANE_STATUS_IO_ERROR;
+
+	if( wpres == pid ) {
+
+		if( WIFEXITED(pf)) {
+			retval = WEXITSTATUS(pf);
+		} else {
+
+			if( !WIFSIGNALED(pf)) {
+				retval = SANE_STATUS_GOOD;
+			} else {
+				DBG( 1, "Child terminated by signal %d\n", WTERMSIG(pf));
+				if( WTERMSIG(pf) == SIGTERM )
+					retval = SANE_STATUS_GOOD;
+			}
+		}
+	}
+	return retval;
+}
+#endif
+
 int
-sanei_thread_kill( int pid, int sig)
+sanei_thread_begin( int (func)(void *args), void* args )
 {
-#ifdef HAVE_OS2_H
-   return DosKillThread( pid);
+	int       pid;
+#ifdef USE_PTHREAD
+	struct sigaction act;
+	pthread_t thread;
+
+	/* if signal handler for SIGPIPE is SIG_DFL, replace by SIG_IGN */
+	if( sigaction( SIGPIPE, NULL, &act ) == 0 ) {
+
+		if( act.sa_handler == SIG_DFL ) {
+			sigemptyset( &act.sa_mask );
+			act.sa_flags   = 0;
+			act.sa_handler = SIG_IGN;
+
+			DBG( 2, "setting SIGPIPE to SIG_IGN\n" );
+			sigaction( SIGPIPE, &act, NULL );
+		}
+	}
+
+	td.func      = func;
+	td.func_data = args;
+
+	pid = pthread_create( &thread, NULL, local_thread, &td );
+	usleep( 1 );
+
+	if ( pid != 0 ) {
+		DBG( 1, "pthread_create() failed with %d\n", pid );
+		return -1;
+	}
+
+	DBG( 2, "pthread_create() created thread %d\n", (int)thread );
+	return (int)thread;
 #else
-   return kill( pid, sig);
+	pid = fork();
+	if( pid < 0 ) {
+		DBG( 1, "fork() failed\n" );
+		return -1;
+	}
+
+	if( pid == 0 ) {
+
+    	/* run in child context... */
+	    int status = func( args );
+		
+		/* don't use exit() since that would run the atexit() handlers */
+		_exit( status );
+	}
+
+	/* parents return */
+	return pid;
 #endif
 }
 
 int
-sanei_thread_waitpid( int pid, int *stat_loc, int options)
+sanei_thread_sendsig( int pid, int sig )
 {
-#ifdef HAVE_OS2_H
-   return pid; /* DosWaitThread( (TID*) &pid, DCWW_WAIT);*/
+#ifdef USE_PTHREAD
+	DBG(2, "sanei_thread_sendsig() %d to thread(id=%d)\n", sig, pid);
+	return pthread_kill((pthread_t)pid, sig );
 #else
-   return waitpid( pid, stat_loc, options);
+	DBG(2, "sanei_thread_sendsig() %d to process (id=%d)\n", sig, pid);
+	return kill( pid, sig );
 #endif
 }
 
 int
-sanei_thread_wait( int *stat_loc)
+sanei_thread_waitpid( int pid, int *status )
 {
-#ifdef HAVE_OS2_H
-   *stat_loc = 0;
-   return -1;  /* return error because I don't know child pid */
+#ifdef USE_PTHREAD
+	int *ls;
 #else
-   return wait( stat_loc);
+	int ls;
+#endif
+	int  result, stat;
+
+	stat = 0;
+
+	DBG(2, "sanei_thread_waitpid() - %d\n", pid);
+#ifdef USE_PTHREAD
+	result = pthread_join((pthread_t)pid, (void*)&ls );
+
+	if( 0 == result ) {
+		if( PTHREAD_CANCELED == ls ) {
+			DBG(2, "* thread has been canceled!\n" );
+			stat = SANE_STATUS_GOOD;
+		} else {
+			stat = *ls;
+		}
+		DBG(2, "* result = %d (%p)\n", stat, (void*)status );
+		result = pid;
+	}
+	/* call detach in any case to make sure that the thread resources 
+	 * will be freed, when the thread has terminated
+	 */
+	DBG(2, "* detaching thread(%d)\n", pid );
+	pthread_detach((pthread_t)pid);
+	if (status)
+		*status = stat;
+
+	restore_sigpipe();
+#else
+	result = waitpid( pid, &ls, 0 );
+	if((result < 0) && (errno == ECHILD)) {
+		stat   = SANE_STATUS_GOOD;
+		result = pid;
+	} else {
+		stat = eval_wp_result( pid, result, ls );
+		DBG(2, "* result = %d (%p)\n", stat, (void*)status );
+	}
+	if( status )
+		*status = stat;
+#endif
+	return result;
+}
+
+#endif /* HAVE_OS2_H */
+
+SANE_Status
+sanei_thread_get_status( int pid )
+{
+#if defined USE_PTHREAD || defined HAVE_OS2_H
+	_VAR_NOT_USED( pid );
+
+	return td.status;
+#else
+	int ls, stat, result;
+
+	stat = SANE_STATUS_IO_ERROR;
+	if( pid > 0 ) {
+
+		result = waitpid( pid, &ls, WNOHANG );
+
+		stat = eval_wp_result( pid, result, ls );
+	}
+	return stat;
 #endif
 }
 
+/* END sanei_thread.c .......................................................*/
diff -urNad sane-frontends-1.0.13/sanei/sanei_wire.c /tmp/dpep.TALHag/sane-frontends-1.0.13/sanei/sanei_wire.c
--- sane-frontends-1.0.13/sanei/sanei_wire.c	2001-05-27 21:43:14.000000000 +0200
+++ /tmp/dpep.TALHag/sane-frontends-1.0.13/sanei/sanei_wire.c	2004-12-09 15:42:00.000000000 +0100
@@ -49,28 +49,46 @@
 #include <sane/sane.h>
 #include "../include/sane/sanei_wire.h"
 
+#define BACKEND_NAME sanei_wire
+#include "../include/sane/sanei_debug.h"
+
 void
-sanei_w_space (Wire *w, size_t howmuch)
+sanei_w_space (Wire * w, size_t howmuch)
 {
   size_t nbytes, left_over;
   int fd = w->io.fd;
   ssize_t nread, nwritten;
 
+  DBG (3, "sanei_w_space: %lu bytes for wire %d\n", (u_long) howmuch, fd);
+
+  if (howmuch > w->buffer.size)
+    DBG (2, "sanei_w_space: bigger than buffer (%lu bytes), "
+	 "may be flush()\n", (u_long) w->buffer.size);
+
   if (w->status != 0)
-    return;
+    {
+      DBG (1, "sanei_w_space: wire is in invalid state %d\n", 
+	   w->status);
+      return;
+    }
 
   if (w->buffer.curr + howmuch > w->buffer.end)
     {
+      DBG (4, "sanei_w_space: free buffer size is %lu\n",
+	   (u_long) (w->buffer.end - w->buffer.curr));
       switch (w->direction)
 	{
 	case WIRE_ENCODE:
 	  nbytes = w->buffer.curr - w->buffer.start;
 	  w->buffer.curr = w->buffer.start;
+	  DBG (4, "sanei_w_space: ENCODE: sending %lu bytes\n", 
+	       (u_long) nbytes);
 	  while (nbytes > 0)
 	    {
 	      nwritten = (*w->io.write) (fd, w->buffer.curr, nbytes);
 	      if (nwritten < 0)
 		{
+		  DBG (1, "sanei_w_space: ENCODE: write failed (%d)\n", errno);
 		  w->status = errno;
 		  return;
 		}
@@ -79,24 +97,37 @@
 	    }
 	  w->buffer.curr = w->buffer.start;
 	  w->buffer.end = w->buffer.start + w->buffer.size;
+	  DBG (4, "sanei_w_space: ENCODE: free buffer is now %lu\n",
+	       (u_long) w->buffer.size);
 	  break;
 
 	case WIRE_DECODE:
 	  left_over = w->buffer.end - w->buffer.curr;
 
-	  if ((signed)left_over < 0)
-	    return;
-	  
+	  if ((signed) left_over < 0)
+	    {
+	      DBG (1, "sanei_w_space: DECODE: buffer underflow\n");
+	      return;
+	    }
+
 	  if (left_over)
-	    memcpy (w->buffer.start, w->buffer.curr, left_over);
+	    {
+	      DBG (4, "sanei_w_space: DECODE: %lu bytes left in buffer\n",
+		   (u_long) left_over);
+	      memmove (w->buffer.start, w->buffer.curr, left_over);
+	    }
 	  w->buffer.curr = w->buffer.start;
 	  w->buffer.end = w->buffer.start + left_over;
 
-	  do {
+	  DBG (4, "sanei_w_space: DECODE: receiving data\n");
+	  do
+	    {
 	      nread = (*w->io.read) (fd, w->buffer.end,
 				     w->buffer.size - left_over);
 	      if (nread <= 0)
 		{
+		  DBG (2, "sanei_w_space: DECODE: no data received (%d)\n",
+		       errno);
 		  if (nread == 0)
 		    errno = EINVAL;
 		  w->status = errno;
@@ -104,32 +135,43 @@
 		}
 	      left_over += nread;
 	      w->buffer.end += nread;
-	  } while (left_over < howmuch);
+	    }
+	  while (left_over < howmuch);
+	  DBG (4, "sanei_w_space: DECODE: %lu bytes read\n",
+	       (u_long) (w->buffer.end - w->buffer.start));
 	  break;
 
 	case WIRE_FREE:
+	  DBG (4, "sanei_w_space: FREE: doing nothing for free operation\n");
 	  break;
 	}
     }
+  DBG (4, "sanei_w_space: done\n");
 }
 
 void
-sanei_w_void (Wire *w)
+sanei_w_void (Wire * w)
 {
+  DBG (3, "sanei_w_void: wire %d (void debug output)\n", w->io.fd);
 }
 
 void
-sanei_w_array (Wire *w, SANE_Word *len_ptr, void **v, WireCodecFunc w_element,
-	       size_t element_size)
+sanei_w_array (Wire * w, SANE_Word * len_ptr, void **v,
+	       WireCodecFunc w_element, size_t element_size)
 {
   SANE_Word len;
   char *val;
   int i;
 
+  DBG (3, "sanei_w_array: wire %d, elements of size %lu\n", w->io.fd,
+       (u_long) element_size);
+
   if (w->direction == WIRE_FREE)
     {
       if (*len_ptr && *v)
 	{
+	  DBG (4, "sanei_w_array: FREE: freeing array (%d elements)\n",
+	       *len_ptr);
 	  val = *v;
 	  for (i = 0; i < *len_ptr; ++i)
 	    {
@@ -137,209 +179,334 @@
 	      val += element_size;
 	    }
 	  free (*v);
+	  w->allocated_memory -= (*len_ptr * element_size);
 	}
+      else
+	DBG (1, "sanei_w_array: FREE: tried to free array but *len_ptr or *v "
+	     "was NULL\n");
+	
+      DBG (4, "sanei_w_array: FREE: done\n");
       return;
     }
 
   if (w->direction == WIRE_ENCODE)
     len = *len_ptr;
-
+  DBG (4, "sanei_w_array: send/receive array length\n");
   sanei_w_word (w, &len);
 
+  if (w->status)
+    {
+      DBG (1, "sanei_w_array: bad status: %d\n", w->status);
+      return;
+    }
+  DBG (4, "sanei_w_array: array has %d elements\n", len);
+      
   if (w->direction == WIRE_DECODE)
     {
       *len_ptr = len;
       if (len)
 	{
+	  if (((unsigned int) len) > MAX_MEM 
+	      || ((unsigned int) len * element_size) > MAX_MEM 
+	      || (w->allocated_memory + len * element_size) > MAX_MEM)
+	    {
+	      DBG (0, "sanei_w_array: DECODE: maximum amount of allocated memory "
+		   "exceeded (limit: %u, new allocation: %u, total: %u bytes)\n",
+		   MAX_MEM, len * element_size, MAX_MEM + len * element_size);
+	      w->status = ENOMEM;
+	      return;
+	    }
 	  *v = malloc (len * element_size);
 	  if (*v == 0)
 	    {
 	      /* Malloc failed, so return an error. */
+	      DBG (1, "sanei_w_array: DECODE: not enough free memory\n");
 	      w->status = ENOMEM;
 	      return;
 	    }
+	  memset (*v, 0, len * element_size);
+	  w->allocated_memory += (len * element_size);
 	}
       else
 	*v = 0;
     }
 
   val = *v;
+  DBG (4, "sanei_w_array: transferring array elements\n");
   for (i = 0; i < len; ++i)
     {
       (*w_element) (w, val);
       val += element_size;
+      if (w->status)
+	{
+	  DBG (1, "sanei_w_array: bad status: %d\n", w->status);
+	  return;
+	}
     }
+  DBG (4, "sanei_w_array: done\n");
 }
 
 void
-sanei_w_ptr (Wire *w, void **v, WireCodecFunc w_value, size_t value_size)
+sanei_w_ptr (Wire * w, void **v, WireCodecFunc w_value, size_t value_size)
 {
   SANE_Word is_null;
 
+  DBG (3, "sanei_w_ptr: wire %d, value pointer at is %lu bytes\n", w->io.fd,
+       (u_long) value_size);
+
   if (w->direction == WIRE_FREE)
     {
       if (*v && value_size)
 	{
+	  DBG (4, "sanei_w_ptr: FREE: freeing value\n");
 	  (*w_value) (w, *v);
 	  free (*v);
+	  w->allocated_memory -= value_size;
 	}
+      else
+	DBG (1, "sanei_w_ptr: FREE: tried to free value but *v or value_size "
+	     "was NULL\n");
+
+      DBG (4, "sanei_w_ptr: FREE: done\n");
       return;
     }
   if (w->direction == WIRE_ENCODE)
     is_null = (*v == 0);
 
+  DBG (4, "sanei_w_ptr: send/receive is_null\n");
   sanei_w_word (w, &is_null);
+  if (w->status)
+    {
+      DBG (1, "sanei_w_ptr: bad status: %d\n", w->status);
+      return;
+    }
 
   if (!is_null)
     {
       if (w->direction == WIRE_DECODE)
 	{
+	  DBG (4, "sanei_w_ptr: DECODE: receive data pointed at\n");
+	  if (value_size > MAX_MEM)
+	    {
+	      DBG (0, "sanei_w_ptr: DECODE: maximum amount of allocated memory "
+		   "exceeded (limit: %u, new allocation: %u, total: %u bytes)\n",
+		   MAX_MEM, value_size, (w->allocated_memory + value_size));
+	      w->status = ENOMEM;
+	      return;
+	    }
+
 	  *v = malloc (value_size);
 	  if (*v == 0)
 	    {
 	      /* Malloc failed, so return an error. */
+	      DBG (1, "sanei_w_ptr: DECODE: not enough free memory\n");
 	      w->status = ENOMEM;
 	      return;
 	    }
+	  w->allocated_memory += value_size;
+	  memset (*v, 0, value_size);
 	}
       (*w_value) (w, *v);
     }
   else if (w->direction == WIRE_DECODE)
     *v = 0;
+
+  DBG (4, "sanei_w_ptr: done\n");
 }
 
 void
-sanei_w_byte (Wire *w, SANE_Byte *v)
+sanei_w_byte (Wire * w, SANE_Byte * v)
 {
+  DBG (3, "sanei_w_byte: wire %d\n", w->io.fd);
   (*w->codec.w_byte) (w, v);
+  if (w->direction != WIRE_FREE)
+    DBG (4, "sanei_w_byte: value = %d\n", *v);
 }
 
 void
-sanei_w_char (Wire *w, SANE_Char *v)
+sanei_w_char (Wire * w, SANE_Char * v)
 {
+  DBG (3, "sanei_w_char: wire %d\n", w->io.fd);
   (*w->codec.w_char) (w, v);
+  if (w->direction != WIRE_FREE)
+    DBG (4, "sanei_w_char: value = %d\n", *v);
 }
 
 void
-sanei_w_word (Wire *w, SANE_Word *v)
+sanei_w_word (Wire * w, SANE_Word * v)
 {
+  DBG (3, "sanei_w_word: wire %d\n", w->io.fd);
   (*w->codec.w_word) (w, v);
+  if (w->direction != WIRE_FREE)
+    DBG (4, "sanei_w_word: value = %d\n", *v);
 }
 
 void
-sanei_w_string (Wire *w, SANE_String *v)
+sanei_w_string (Wire * w, SANE_String * v)
 {
+  DBG (3, "sanei_w_string: wire %d\n", w->io.fd);
   (*w->codec.w_string) (w, v);
+  if (w->direction != WIRE_FREE && w->status == 0)
+    DBG (4, "sanei_w_string: value = %s\n", *v);
 }
 
 void
-sanei_w_status (Wire *w, SANE_Status *v)
+sanei_w_status (Wire * w, SANE_Status * v)
 {
   SANE_Word word = *v;
 
+  DBG (3, "sanei_w_status: wire %d\n", w->io.fd);
+
   sanei_w_word (w, &word);
   if (w->direction == WIRE_DECODE)
     *v = word;
+
+  if (w->direction != WIRE_FREE)
+    DBG (4, "sanei_w_status: value = %d\n", word);
 }
 
 void
-sanei_w_bool (Wire *w, SANE_Bool *v)
+sanei_w_bool (Wire * w, SANE_Bool * v)
 {
   SANE_Word word = *v;
 
+  DBG (3, "sanei_w_bool: wire %d\n", w->io.fd);
   sanei_w_word (w, &word);
   if (w->direction == WIRE_DECODE)
     *v = word;
+
+  if (w->direction != WIRE_FREE)
+    DBG (4, "sanei_w_bool: value = %s\n",
+	 ((word == SANE_TRUE) ? ("true") : ("false")));
 }
 
 void
-sanei_w_constraint_type (Wire *w, SANE_Constraint_Type *v)
+sanei_w_constraint_type (Wire * w, SANE_Constraint_Type * v)
 {
   SANE_Word word = *v;
 
+  DBG (3, "sanei_w_constraint_type: wire %d\n", w->io.fd);
+
   sanei_w_word (w, &word);
   if (w->direction == WIRE_DECODE)
     *v = word;
+
+  if (w->direction != WIRE_FREE)
+    DBG (4, "sanei_w_constraint_type: value = %d\n", word);
 }
 
 void
-sanei_w_value_type (Wire *w, SANE_Value_Type *v)
+sanei_w_value_type (Wire * w, SANE_Value_Type * v)
 {
   SANE_Word word = *v;
 
+  DBG (3, "sanei_w_value_type: wire %d\n", w->io.fd);
+
   sanei_w_word (w, &word);
   if (w->direction == WIRE_DECODE)
     *v = word;
+  if (w->direction != WIRE_FREE)
+    DBG (4, "sanei_w_value_type: value = %d\n", word);
 }
 
 void
-sanei_w_unit (Wire *w, SANE_Unit *v)
+sanei_w_unit (Wire * w, SANE_Unit * v)
 {
   SANE_Word word = *v;
 
+  DBG (3, "sanei_w_unit: wire %d\n", w->io.fd);
   sanei_w_word (w, &word);
   if (w->direction == WIRE_DECODE)
     *v = word;
+
+  if (w->direction != WIRE_FREE)
+    DBG (4, "sanei_w_unit: value = %d\n", word);
+  /* gosh... all the sane_w_something should be a macro or something */
 }
 
 void
-sanei_w_action (Wire *w, SANE_Action *v)
+sanei_w_action (Wire * w, SANE_Action * v)
 {
   SANE_Word word = *v;
 
+  DBG (3, "sanei_w_action: wire %d\n", w->io.fd);
+
   sanei_w_word (w, &word);
   if (w->direction == WIRE_DECODE)
     *v = word;
+
+  if (w->direction != WIRE_FREE)
+    DBG (4, "sanei_w_action: value = %d\n", word);
 }
 
 void
-sanei_w_frame (Wire *w, SANE_Frame *v)
+sanei_w_frame (Wire * w, SANE_Frame * v)
 {
   SANE_Word word = *v;
 
+  DBG (3, "sanei_w_frame: wire %d\n", w->io.fd);
+
   sanei_w_word (w, &word);
   if (w->direction == WIRE_DECODE)
     *v = word;
+
+  if (w->direction != WIRE_FREE)
+    DBG (4, "sanei_w_frame: value = %d\n", word);
 }
 
 void
-sanei_w_range (Wire *w, SANE_Range *v)
+sanei_w_range (Wire * w, SANE_Range * v)
 {
+  DBG (3, "sanei_w_range: wire %d\n", w->io.fd);
   sanei_w_word (w, &v->min);
   sanei_w_word (w, &v->max);
   sanei_w_word (w, &v->quant);
+  if (w->direction != WIRE_FREE)
+    DBG (4, "sanei_w_range: min/max/step = %f/%f/%f\n",
+	 SANE_UNFIX (v->min), SANE_UNFIX (v->max), SANE_UNFIX (v->quant));
 }
 
 void
-sanei_w_device (Wire *w, SANE_Device *v)
+sanei_w_device (Wire * w, SANE_Device * v)
 {
-  sanei_w_string (w, (SANE_String *) &v->name);
-  sanei_w_string (w, (SANE_String *) &v->vendor);
-  sanei_w_string (w, (SANE_String *) &v->model);
-  sanei_w_string (w, (SANE_String *) &v->type);
+  DBG (3, "sanei_w_device: wire %d\n", w->io.fd);
+  sanei_w_string (w, (SANE_String *) & v->name);
+  sanei_w_string (w, (SANE_String *) & v->vendor);
+  sanei_w_string (w, (SANE_String *) & v->model);
+  sanei_w_string (w, (SANE_String *) & v->type);
+  if (w->direction != WIRE_FREE)
+    DBG (4, "sanei_w_device: %s %s from %s (%s)\n", v->name, v->model,
+	 v->vendor, v->type);
 }
 
 void
-sanei_w_device_ptr (Wire *w, SANE_Device **v)
+sanei_w_device_ptr (Wire * w, SANE_Device ** v)
 {
-  sanei_w_ptr (w, (void **) v,
-	       (WireCodecFunc) sanei_w_device, sizeof (**v));
+  DBG (3, "sanei_w_device_ptr: wire %d\n", w->io.fd);
+  sanei_w_ptr (w, (void **) v, (WireCodecFunc) sanei_w_device, sizeof (**v));
+  if (w->direction != WIRE_FREE)
+    DBG (4, "sanei_w_device_ptr: device struct at %p\n", *v);
 }
 
 void
-sanei_w_option_descriptor (Wire *w, SANE_Option_Descriptor *v)
+sanei_w_option_descriptor (Wire * w, SANE_Option_Descriptor * v)
 {
   SANE_Word len;
 
-  sanei_w_string (w, (SANE_String *) &v->name);
-  sanei_w_string (w, (SANE_String *) &v->title);
-  sanei_w_string (w, (SANE_String *) &v->desc);
+  DBG (3, "sanei_w_option_descriptor: wire %d\n", w->io.fd);
+
+  sanei_w_string (w, (SANE_String *) & v->name);
+  sanei_w_string (w, (SANE_String *) & v->title);
+  sanei_w_string (w, (SANE_String *) & v->desc);
   sanei_w_value_type (w, &v->type);
   sanei_w_unit (w, &v->unit);
   sanei_w_word (w, &v->size);
   sanei_w_word (w, &v->cap);
   sanei_w_constraint_type (w, &v->constraint_type);
-  
+
+  if (w->direction != WIRE_FREE)
+    DBG (4, "sanei_w_option_descriptor: option %s\n", v->name);
+
   switch (v->constraint_type)
     {
     case SANE_CONSTRAINT_NONE:
@@ -354,117 +521,174 @@
       if (w->direction != WIRE_DECODE)
 	len = v->constraint.word_list[0] + 1;
       sanei_w_array (w, &len, (void **) &v->constraint.word_list,
-		     w->codec.w_word, sizeof(SANE_Word));
+		     w->codec.w_word, sizeof (SANE_Word));
       break;
 
     case SANE_CONSTRAINT_STRING_LIST:
       if (w->direction != WIRE_DECODE)
 	{
 	  for (len = 0; v->constraint.string_list[len]; ++len);
-	  ++len;	/* send NULL string, too */
+	  ++len;		/* send NULL string, too */
 	}
       sanei_w_array (w, &len, (void **) &v->constraint.string_list,
-		     w->codec.w_string, sizeof(SANE_String));
+		     w->codec.w_string, sizeof (SANE_String));
       break;
     }
+  DBG (4, "sanei_w_option_descriptor: done\n");
 }
 
 void
-sanei_w_option_descriptor_ptr (Wire *w, SANE_Option_Descriptor **v)
+sanei_w_option_descriptor_ptr (Wire * w, SANE_Option_Descriptor ** v)
 {
+  DBG (3, "sanei_w_option_descriptor_ptr: wire %d\n", w->io.fd);
   sanei_w_ptr (w, (void **) v,
 	       (WireCodecFunc) sanei_w_option_descriptor, sizeof (**v));
+  DBG (4, "sanei_w_option_descriptor_ptr: done\n");
 }
 
 void
-sanei_w_parameters (Wire *w, SANE_Parameters *v)
+sanei_w_parameters (Wire * w, SANE_Parameters * v)
 {
+  DBG (3, "sanei_w_parameters: wire %d\n", w->io.fd);
   sanei_w_frame (w, &v->format);
   sanei_w_bool (w, &v->last_frame);
   sanei_w_word (w, &v->bytes_per_line);
   sanei_w_word (w, &v->pixels_per_line);
   sanei_w_word (w, &v->lines);
   sanei_w_word (w, &v->depth);
+  if (w->direction != WIRE_FREE)
+    DBG (4,
+	 "sanei_w_parameters: format/last/bpl/ppl/lines/depth = "
+	 "%d/%d/%d/%d/%d/%d\n", v->format, v->last_frame, v->bytes_per_line,
+	 v->pixels_per_line, v->lines, v->depth);
 }
 
 static void
-flush (Wire *w)
+flush (Wire * w)
 {
+  DBG (3, "flush: wire %d\n", w->io.fd);
   if (w->direction == WIRE_ENCODE)
     sanei_w_space (w, w->buffer.size + 1);
   else if (w->direction == WIRE_DECODE)
     w->buffer.curr = w->buffer.end = w->buffer.start;
+  if (w->status != 0)
+    DBG (2, "flush: error status %d\n", w->status);
+  DBG (4, "flush: wire flushed\n");
 }
 
 void
-sanei_w_set_dir (Wire *w, WireDirection dir)
+sanei_w_set_dir (Wire * w, WireDirection dir)
 {
+  DBG (3, "sanei_w_set_dir: wire %d, old direction WIRE_%s\n", w->io.fd, 
+       w->direction == WIRE_ENCODE ? "ENCODE" : 
+       (w->direction == WIRE_DECODE ? "DECODE" : "FREE"));
+  if (w->direction == WIRE_DECODE && w->buffer.curr != w->buffer.end)
+    DBG (1, "sanei_w_set_dir: WARNING: will delete %lu bytes from buffer\n",
+	 (u_long) (w->buffer.end - w->buffer.curr));
   flush (w);
   w->direction = dir;
+  DBG (4, "sanei_w_set_dir: direction changed\n");
   flush (w);
+  DBG (3, "sanei_w_set_dir: wire %d, new direction WIRE_%s\n", w->io.fd, 
+       dir == WIRE_ENCODE ? "ENCODE" : 
+       (dir == WIRE_DECODE ? "DECODE" : "FREE"));
 }
 
 void
-sanei_w_call (Wire *w,
+sanei_w_call (Wire * w,
 	      SANE_Word procnum,
 	      WireCodecFunc w_arg, void *arg,
 	      WireCodecFunc w_reply, void *reply)
 {
+
+  DBG (3, "sanei_w_call: wire %d (old status %d)\n", w->io.fd, w->status);
   w->status = 0;
   sanei_w_set_dir (w, WIRE_ENCODE);
 
+  DBG (4, "sanei_w_call: sending request (procedure number: %d)\n", procnum);
   sanei_w_word (w, &procnum);
   (*w_arg) (w, arg);
 
   if (w->status == 0)
     {
+      DBG (4, "sanei_w_call: receiving reply\n");
       sanei_w_set_dir (w, WIRE_DECODE);
       (*w_reply) (w, reply);
     }
+
+  if (w->status != 0)
+    DBG (2, "sanei_w_call: error status %d\n", w->status);
+  DBG (4, "sanei_w_call: done\n");
 }
 
 void
-sanei_w_reply (Wire *w, WireCodecFunc w_reply, void *reply)
+sanei_w_reply (Wire * w, WireCodecFunc w_reply, void *reply)
 {
+  DBG (3, "sanei_w_reply: wire %d (old status %d)\n", w->io.fd, w->status);
   w->status = 0;
   sanei_w_set_dir (w, WIRE_ENCODE);
   (*w_reply) (w, reply);
   flush (w);
+  if (w->status != 0)
+    DBG (2, "sanei_w_reply: error status %d\n", w->status);
+  DBG (4, "sanei_w_reply: done\n");
 }
 
 void
-sanei_w_free (Wire *w, WireCodecFunc w_reply, void *reply)
+sanei_w_free (Wire * w, WireCodecFunc w_reply, void *reply)
 {
   WireDirection saved_dir = w->direction;
 
+  DBG (3, "sanei_w_free: wire %d\n", w->io.fd);
+
   w->direction = WIRE_FREE;
   (*w_reply) (w, reply);
   w->direction = saved_dir;
+
+  if (w->status != 0)
+    DBG (2, "sanei_w_free: error status %d\n", w->status);
+  DBG (4, "sanei_w_free: done\n");
 }
 
 void
-sanei_w_init (Wire *w, void (*codec_init_func)(Wire *))
+sanei_w_init (Wire * w, void (*codec_init_func) (Wire *))
 {
+  DBG_INIT ();
+  
+  DBG (3, "sanei_w_init: initializing\n");
   w->status = 0;
   w->direction = WIRE_ENCODE;
   w->buffer.size = 8192;
   w->buffer.start = malloc (w->buffer.size);
-
+  
   if (w->buffer.start == 0)
-    /* Malloc failed, so return an error. */
-    w->status = ENOMEM;
+    {
+      /* Malloc failed, so return an error. */
+      w->status = ENOMEM;
+      DBG (1, "sanei_w_init: not enough free memory\n");
+    }
 
   w->buffer.curr = w->buffer.start;
   w->buffer.end = w->buffer.start + w->buffer.size;
   if (codec_init_func != 0)
-    (*codec_init_func) (w);
+    {
+      DBG (4, "sanei_w_init: initializing codec\n");
+      (*codec_init_func) (w);
+    }
+  w->allocated_memory = 0;
+  DBG (4, "sanei_w_init: done\n");
 }
 
 void
-sanei_w_exit (Wire *w)
+sanei_w_exit (Wire * w)
 {
+  DBG (3, "sanei_w_exit: wire %d\n", w->io.fd);
   if (w->buffer.start)
-    free(w->buffer.start);
+    {
+      DBG (4, "sanei_w_exit: freeing buffer\n");
+      free (w->buffer.start);
+    }
   w->buffer.start = 0;
   w->buffer.size = 0;
+  DBG (4, "sanei_w_exit: done\n");
 }