Commit 718b3ab0e353c4ccb510b0ec9c3673b1c9a7344e

Stefan Sperling 2018-03-17T17:50:48

rename the library-internal headers again to a common prefix

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
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
diff --git a/lib/delta.c b/lib/delta.c
index a1de367..e9f8bcc 100644
--- a/lib/delta.c
+++ b/lib/delta.c
@@ -26,9 +26,9 @@
 #include "got_repository.h"
 #include "got_object.h"
 
-#include "got_delta_lib.h"
-#include "got_path_lib.h"
-#include "got_zbuf_lib.h"
+#include "got_lib_delta.h"
+#include "got_lib_path.h"
+#include "got_lib_zbuf.h"
 
 #ifndef MIN
 #define	MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
diff --git a/lib/diff.c b/lib/diff.c
index 0cc4663..f521723 100644
--- a/lib/diff.c
+++ b/lib/diff.c
@@ -29,8 +29,8 @@
 #include "got_error.h"
 #include "got_diff.h"
 
-#include "got_diff_lib.h"
-#include "got_path_lib.h"
+#include "got_lib_diff.h"
+#include "got_lib_path.h"
 
 const struct got_error *
 got_diff_blob(struct got_blob_object *blob1, struct got_blob_object *blob2,
diff --git a/lib/diffreg.c b/lib/diffreg.c
index 87a1e5f..2fdd381 100644
--- a/lib/diffreg.c
+++ b/lib/diffreg.c
@@ -88,7 +88,7 @@
 #include "got_object.h"
 #include "got_diff.h"
 
-#include "got_diff_lib.h"
+#include "got_lib_diff.h"
 
 #define MINIMUM(a, b)	(((a) < (b)) ? (a) : (b))
 #define MAXIMUM(a, b)	(((a) > (b)) ? (a) : (b))
diff --git a/lib/fileindex.c b/lib/fileindex.c
index 349b0aa..6c2d120 100644
--- a/lib/fileindex.c
+++ b/lib/fileindex.c
@@ -25,7 +25,7 @@
 
 #include "got_error.h"
 
-#include "got_fileindex_lib.h"
+#include "got_lib_fileindex.h"
 
 const struct got_error *
 got_fileindex_entry_open(struct got_fileindex_entry **entry,
diff --git a/lib/got_delta_lib.h b/lib/got_delta_lib.h
deleted file mode 100644
index bc986fd..0000000
--- a/lib/got_delta_lib.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-struct got_delta {
-	SIMPLEQ_ENTRY(got_delta) entry;
-	off_t offset;
-	size_t tslen;
-	int type;
-	size_t size;
-	off_t data_offset;
-	uint8_t *delta_buf;
-	size_t delta_len;
-};
-
-struct got_delta_chain {
-	int nentries;
-	SIMPLEQ_HEAD(, got_delta) entries;
-};
-
-struct got_delta *got_delta_open(const char *, off_t, size_t, int, size_t,
-    off_t, uint8_t *, size_t);
-void got_delta_close(struct got_delta *);
-const struct got_error *got_delta_chain_get_base_type(int *,
-    struct got_delta_chain *);
-const struct got_error *got_delta_get_sizes(uint64_t *, uint64_t *,
-    const uint8_t *, size_t);
-const struct got_error *got_delta_apply_in_mem(uint8_t *, const uint8_t *,
-    size_t, uint8_t *, size_t *);
-const struct got_error *got_delta_apply(FILE *, const uint8_t *, size_t,
-    FILE *, size_t *);
-
-/*
- * The amount of result data we may keep in RAM while applying deltas.
- * Data larger than this is written to disk during delta application (slow).
- */
-#define GOT_DELTA_RESULT_SIZE_CACHED_MAX	(4 * 1024 * 1024) /* bytes */
-
-/*
- * Definitions for delta data streams.
- */
-
-#define GOT_DELTA_STREAM_LENGTH_MIN	4	/* bytes */
-
-/*
- * A delta stream begins with two size fields. The first specifies the
- * size of the delta base, and the second describes the expected size of
- * the data which results from applying the delta to the delta base.
- *
- * Each size field uses a variable length encoding:
- * size0...sizeN form a 7+7+7+...+7 bit integer, where size0 is the
- * least significant part and sizeN is the most significant part.
- * If the MSB of a size byte is set, an additional size byte follows.
- */
-#define GOT_DELTA_SIZE_VAL_MASK	0x7f
-#define GOT_DELTA_SIZE_SHIFT	7
-#define GOT_DELTA_SIZE_MORE	0x80
-
-/*
- * The rest of the delta stream contains copy instructions.
- *
- * A base copy instruction copies N bytes starting at offset X from the delta
- * base to the output. Base copy instructions begin with a byte which has its
- * MSB set. The remaining bits of this byte describe how many offset and
- * length value bytes follow.
- * The offset X is encoded in 1 to 4 bytes, and the length N is encoded in
- * 1 to 3 bytes. For both values, the first byte contributes the least
- * significant part and the last byte which is present contributes the
- * most significant part.
- * If the offset value is omitted, an offset of zero is implied.
- * If the length value is omitted, a default length of 65536 bytes is implied.
- *
- * An inline copy instruction copies data from the delta stream to the output.
- * Such instructions begin with one byte which does not have the MSB set
- * and which specifies the length of the inline data which follows (i.e.
- * at most 127 bytes). A length value of zero is invalid.
- */
-
-#define GOT_DELTA_BASE_COPY	0x80
-
-#define GOT_DELTA_COPY_OFF1	0x01	/* byte 1 of offset is present */
-#define GOT_DELTA_COPY_OFF2	0x02	/* byte 2 of offset is present */
-#define GOT_DELTA_COPY_OFF3	0x04	/* byte 3 of offset is present */
-#define GOT_DELTA_COPY_OFF4	0x08	/* byte 4 of offset is present */
-
-#define GOT_DELTA_COPY_LEN1	0x10	/* byte 1 of length is present */
-#define GOT_DELTA_COPY_LEN2	0x20	/* byte 2 of length is present */
-#define GOT_DELTA_COPY_LEN3	0x40	/* byte 3 of length is present */
-
-#define GOT_DELTA_COPY_DEFAULT_OFF	0x0	/* default offset if omitted */
-#define GOT_DELTA_COPY_DEFAULT_LEN	0x10000 /* default length if omitted */
diff --git a/lib/got_diff_lib.h b/lib/got_diff_lib.h
deleted file mode 100644
index d035103..0000000
--- a/lib/got_diff_lib.h
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-/*ROR
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)diff.h	8.1 (Berkeley) 6/6/93
- */
-
-#include <sys/types.h>
-#include <regex.h>
-
-/*
- * Output format options
- */
-#define	D_NORMAL	0	/* Normal output */
-#define	D_EDIT		-1	/* Editor script out */
-#define	D_REVERSE	1	/* Reverse editor script */
-#define	D_CONTEXT	2	/* Diff with context */
-#define	D_UNIFIED	3	/* Unified context diff */
-#define	D_IFDEF		4	/* Diff with merged #ifdef's */
-#define	D_NREVERSE	5	/* Reverse ed script with numbered
-				   lines and no trailing . */
-#define	D_BRIEF		6	/* Say if the files differ */
-
-/*
- * Output flags
- */
-#define	D_HEADER	0x001	/* Print a header/footer between files */
-#define	D_EMPTY1	0x002	/* Treat first file as empty (/dev/null) */
-#define	D_EMPTY2	0x004	/* Treat second file as empty (/dev/null) */
-
-/*
- * Command line flags
- */
-#define D_FORCEASCII	0x008	/* Treat file as ascii regardless of content */
-#define D_FOLDBLANKS	0x010	/* Treat all white space as equal */
-#define D_MINIMAL	0x020	/* Make diff as small as possible */
-#define D_IGNORECASE	0x040	/* Case-insensitive matching */
-#define D_PROTOTYPE	0x080	/* Display C function prototype */
-#define D_EXPANDTABS	0x100	/* Expand tabs to spaces */
-#define D_IGNOREBLANKS	0x200	/* Ignore white space changes */
-
-/*
- * Status values for print_status() and diffreg() return values
- */
-#define	D_SAME		0	/* Files are the same */
-#define	D_DIFFER	1	/* Files are different */
-#define	D_BINARY	2	/* Binary files are different */
-#define	D_MISMATCH1	3	/* path1 was a dir, path2 a file */
-#define	D_MISMATCH2	4	/* path1 was a file, path2 a dir */
-#define	D_SKIPPED1	5	/* path1 was a special file */
-#define	D_SKIPPED2	6	/* path2 was a special file */
-
-struct excludes {
-	char *pattern;
-	struct excludes *next;
-};
-
-struct got_diff_state {
-	int  *J;			/* will be overlaid on class */
-	int  *class;		/* will be overlaid on file[0] */
-	int  *klist;		/* will be overlaid on file[0] after class */
-	int  *member;		/* will be overlaid on file[1] */
-	int   clen;
-	int   inifdef;		/* whether or not we are in a #ifdef block */
-	int   len[2];
-	int   pref, suff;	/* length of prefix and suffix */
-	int   slen[2];
-	int   anychange;
-	long *ixnew;		/* will be overlaid on file[1] */
-	long *ixold;		/* will be overlaid on klist */
-	struct cand *clist;	/* merely a free storage pot for candidates */
-	int   clistlen;		/* the length of clist */
-	struct line *sfile[2];	/* shortened by pruning common prefix/suffix */
-	u_char *chrtran;		/* translation table for case-folding */
-	struct context_vec *context_vec_start;
-	struct context_vec *context_vec_end;
-	struct context_vec *context_vec_ptr;
-	struct line *file[2];
-#define FUNCTION_CONTEXT_SIZE	55
-	char lastbuf[FUNCTION_CONTEXT_SIZE];
-	int lastline;
-	int lastmatchline;
-	struct stat stb1, stb2;
-};
-
-struct got_diff_args {
-	int	 Tflag;
-	int	 diff_format, diff_context, status;
-	char	*ifdefname, *diffargs, *ignore_pats;
-	const char *label[2];
-};
-
-char	*splice(char *, char *);
-const struct got_error *got_diffreg(int *, FILE *,
-    FILE *, int, struct got_diff_args *, struct got_diff_state *, FILE *);
-int	easprintf(char **, const char *, ...);
-void	*emalloc(size_t);
-void	*erealloc(void *, size_t);
-void	diffdir(char *, char *, int);
-void	print_only(const char *, size_t, const char *);
-void	print_status(int, char *, char *, char *);
diff --git a/lib/got_fileindex_lib.h b/lib/got_fileindex_lib.h
deleted file mode 100644
index 018f4f2..0000000
--- a/lib/got_fileindex_lib.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * State information for a tracked file in a work tree.
- * When written to disk, multi-byte fields are written in big-endian.
- * Some fields are based on results from stat(2). These are only used in
- * order to detect modifications made to on-disk files, they are never
- * applied back to the filesystem.
- */
-struct got_fileindex_entry {
-	TAILQ_ENTRY(got_fileindex_entry) entry;
-	uint64_t ctime_sec;
-	uint64_t ctime_nsec;
-	uint64_t mtime_sec;
-	uint64_t mtime_nsec;
-	uint32_t uid;
-	uint32_t gid;
-	/*
-	 * On-disk size is truncated to the lower 32 bits.
-	 * The value is only used to check for modifications anyway.
-	 */
-	uint32_t size;
-
-	uint16_t mode;
-#define GOT_INDEX_ENTRY_MODE_FILE_TYPE		0x000f
-#define GOT_INDEX_ENTRY_MODE_REGULAR_FILE	1
-#define GOT_INDEX_ENTRY_MODE_SYMLINK		2
-#define GOT_INDEX_ENTRY_MODE_PERMS		0xff10
-#define GOT_INDEX_ENTRY_MODE_PERMS_SHIFT	4
-
-	/* SHA1 of corresponding blob in repository. */
-	uint8_t blob_sha1[SHA1_DIGEST_LENGTH];
-
-	uint32_t flags;
-#define GOT_INDEX_ENTRY_F_PATH_LEN	0x00000fff
-#define GOT_INDEX_ENTRY_F_STAGE		0x00003000
-#define GOT_INDEX_ENTRY_F_EXTENDED	0x00004000
-#define GOT_INDEX_ENTRY_F_ASSUME_VALID	0x00008000
-
-	/*
-	 * UNIX-style path, relative to work tree root.
-	 * Variable length, and NUL-padded to a multiple of 8 on disk.
-	 */
-	char *path;
-
-	/* More data could be here if F_EXTENDED is set; To be determined... */
-};
-
-/* "Stages" of a file afflicted by a 3-way merge conflict. */
-#define GOT_INDEX_ENTRY_STAGE_MERGED	0
-#define GOT_INDEX_ENTRY_STAGE_ANCESTOR	1
-#define GOT_INDEX_ENTRY_STAGE_OURS	2
-#define GOT_INDEX_ENTRY_STAGE_THEIRS	3
-
-struct got_fileindex {
-	uint32_t nentries;
-	TAILQ_HEAD(, got_fileindex_entry) entries;
-};
-
-/* On-disk file index header structure. */
-struct got_fileindex_hdr {
-	uint32_t signature;	/* big-endian */
-#define GOT_FILE_INDEX_SIGNATURE	0x676f7449 /* 'g', 'o', 't', 'I' */
-	uint32_t version;	/* big-endian */
-#define GOT_FILE_INDEX_VERSION	1
-	uint32_t nentries;	/* big-endian */
-	/* list of concatenated fileindex entries */
-	uint8_t sha1[SHA1_DIGEST_LENGTH]; /* checksum of above on-disk data */
-};
-
-const struct got_error *got_fileindex_entry_open(struct got_fileindex_entry **,
-    const char *, const char *, uint8_t *);
-void got_fileindex_entry_close(struct got_fileindex_entry *);
-struct got_fileindex *got_fileindex_open(void);
-void got_fileindex_close(struct got_fileindex *);
-const struct got_error *got_fileindex_write(struct got_fileindex *, FILE *);
-const struct got_error *got_fileindex_entry_add(struct got_fileindex *,
-    struct got_fileindex_entry *);
diff --git a/lib/got_lib_delta.h b/lib/got_lib_delta.h
new file mode 100644
index 0000000..bc986fd
--- /dev/null
+++ b/lib/got_lib_delta.h
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+struct got_delta {
+	SIMPLEQ_ENTRY(got_delta) entry;
+	off_t offset;
+	size_t tslen;
+	int type;
+	size_t size;
+	off_t data_offset;
+	uint8_t *delta_buf;
+	size_t delta_len;
+};
+
+struct got_delta_chain {
+	int nentries;
+	SIMPLEQ_HEAD(, got_delta) entries;
+};
+
+struct got_delta *got_delta_open(const char *, off_t, size_t, int, size_t,
+    off_t, uint8_t *, size_t);
+void got_delta_close(struct got_delta *);
+const struct got_error *got_delta_chain_get_base_type(int *,
+    struct got_delta_chain *);
+const struct got_error *got_delta_get_sizes(uint64_t *, uint64_t *,
+    const uint8_t *, size_t);
+const struct got_error *got_delta_apply_in_mem(uint8_t *, const uint8_t *,
+    size_t, uint8_t *, size_t *);
+const struct got_error *got_delta_apply(FILE *, const uint8_t *, size_t,
+    FILE *, size_t *);
+
+/*
+ * The amount of result data we may keep in RAM while applying deltas.
+ * Data larger than this is written to disk during delta application (slow).
+ */
+#define GOT_DELTA_RESULT_SIZE_CACHED_MAX	(4 * 1024 * 1024) /* bytes */
+
+/*
+ * Definitions for delta data streams.
+ */
+
+#define GOT_DELTA_STREAM_LENGTH_MIN	4	/* bytes */
+
+/*
+ * A delta stream begins with two size fields. The first specifies the
+ * size of the delta base, and the second describes the expected size of
+ * the data which results from applying the delta to the delta base.
+ *
+ * Each size field uses a variable length encoding:
+ * size0...sizeN form a 7+7+7+...+7 bit integer, where size0 is the
+ * least significant part and sizeN is the most significant part.
+ * If the MSB of a size byte is set, an additional size byte follows.
+ */
+#define GOT_DELTA_SIZE_VAL_MASK	0x7f
+#define GOT_DELTA_SIZE_SHIFT	7
+#define GOT_DELTA_SIZE_MORE	0x80
+
+/*
+ * The rest of the delta stream contains copy instructions.
+ *
+ * A base copy instruction copies N bytes starting at offset X from the delta
+ * base to the output. Base copy instructions begin with a byte which has its
+ * MSB set. The remaining bits of this byte describe how many offset and
+ * length value bytes follow.
+ * The offset X is encoded in 1 to 4 bytes, and the length N is encoded in
+ * 1 to 3 bytes. For both values, the first byte contributes the least
+ * significant part and the last byte which is present contributes the
+ * most significant part.
+ * If the offset value is omitted, an offset of zero is implied.
+ * If the length value is omitted, a default length of 65536 bytes is implied.
+ *
+ * An inline copy instruction copies data from the delta stream to the output.
+ * Such instructions begin with one byte which does not have the MSB set
+ * and which specifies the length of the inline data which follows (i.e.
+ * at most 127 bytes). A length value of zero is invalid.
+ */
+
+#define GOT_DELTA_BASE_COPY	0x80
+
+#define GOT_DELTA_COPY_OFF1	0x01	/* byte 1 of offset is present */
+#define GOT_DELTA_COPY_OFF2	0x02	/* byte 2 of offset is present */
+#define GOT_DELTA_COPY_OFF3	0x04	/* byte 3 of offset is present */
+#define GOT_DELTA_COPY_OFF4	0x08	/* byte 4 of offset is present */
+
+#define GOT_DELTA_COPY_LEN1	0x10	/* byte 1 of length is present */
+#define GOT_DELTA_COPY_LEN2	0x20	/* byte 2 of length is present */
+#define GOT_DELTA_COPY_LEN3	0x40	/* byte 3 of length is present */
+
+#define GOT_DELTA_COPY_DEFAULT_OFF	0x0	/* default offset if omitted */
+#define GOT_DELTA_COPY_DEFAULT_LEN	0x10000 /* default length if omitted */
diff --git a/lib/got_lib_diff.h b/lib/got_lib_diff.h
new file mode 100644
index 0000000..d035103
--- /dev/null
+++ b/lib/got_lib_diff.h
@@ -0,0 +1,127 @@
+
+
+/*ROR
+ * Copyright (c) 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)diff.h	8.1 (Berkeley) 6/6/93
+ */
+
+#include <sys/types.h>
+#include <regex.h>
+
+/*
+ * Output format options
+ */
+#define	D_NORMAL	0	/* Normal output */
+#define	D_EDIT		-1	/* Editor script out */
+#define	D_REVERSE	1	/* Reverse editor script */
+#define	D_CONTEXT	2	/* Diff with context */
+#define	D_UNIFIED	3	/* Unified context diff */
+#define	D_IFDEF		4	/* Diff with merged #ifdef's */
+#define	D_NREVERSE	5	/* Reverse ed script with numbered
+				   lines and no trailing . */
+#define	D_BRIEF		6	/* Say if the files differ */
+
+/*
+ * Output flags
+ */
+#define	D_HEADER	0x001	/* Print a header/footer between files */
+#define	D_EMPTY1	0x002	/* Treat first file as empty (/dev/null) */
+#define	D_EMPTY2	0x004	/* Treat second file as empty (/dev/null) */
+
+/*
+ * Command line flags
+ */
+#define D_FORCEASCII	0x008	/* Treat file as ascii regardless of content */
+#define D_FOLDBLANKS	0x010	/* Treat all white space as equal */
+#define D_MINIMAL	0x020	/* Make diff as small as possible */
+#define D_IGNORECASE	0x040	/* Case-insensitive matching */
+#define D_PROTOTYPE	0x080	/* Display C function prototype */
+#define D_EXPANDTABS	0x100	/* Expand tabs to spaces */
+#define D_IGNOREBLANKS	0x200	/* Ignore white space changes */
+
+/*
+ * Status values for print_status() and diffreg() return values
+ */
+#define	D_SAME		0	/* Files are the same */
+#define	D_DIFFER	1	/* Files are different */
+#define	D_BINARY	2	/* Binary files are different */
+#define	D_MISMATCH1	3	/* path1 was a dir, path2 a file */
+#define	D_MISMATCH2	4	/* path1 was a file, path2 a dir */
+#define	D_SKIPPED1	5	/* path1 was a special file */
+#define	D_SKIPPED2	6	/* path2 was a special file */
+
+struct excludes {
+	char *pattern;
+	struct excludes *next;
+};
+
+struct got_diff_state {
+	int  *J;			/* will be overlaid on class */
+	int  *class;		/* will be overlaid on file[0] */
+	int  *klist;		/* will be overlaid on file[0] after class */
+	int  *member;		/* will be overlaid on file[1] */
+	int   clen;
+	int   inifdef;		/* whether or not we are in a #ifdef block */
+	int   len[2];
+	int   pref, suff;	/* length of prefix and suffix */
+	int   slen[2];
+	int   anychange;
+	long *ixnew;		/* will be overlaid on file[1] */
+	long *ixold;		/* will be overlaid on klist */
+	struct cand *clist;	/* merely a free storage pot for candidates */
+	int   clistlen;		/* the length of clist */
+	struct line *sfile[2];	/* shortened by pruning common prefix/suffix */
+	u_char *chrtran;		/* translation table for case-folding */
+	struct context_vec *context_vec_start;
+	struct context_vec *context_vec_end;
+	struct context_vec *context_vec_ptr;
+	struct line *file[2];
+#define FUNCTION_CONTEXT_SIZE	55
+	char lastbuf[FUNCTION_CONTEXT_SIZE];
+	int lastline;
+	int lastmatchline;
+	struct stat stb1, stb2;
+};
+
+struct got_diff_args {
+	int	 Tflag;
+	int	 diff_format, diff_context, status;
+	char	*ifdefname, *diffargs, *ignore_pats;
+	const char *label[2];
+};
+
+char	*splice(char *, char *);
+const struct got_error *got_diffreg(int *, FILE *,
+    FILE *, int, struct got_diff_args *, struct got_diff_state *, FILE *);
+int	easprintf(char **, const char *, ...);
+void	*emalloc(size_t);
+void	*erealloc(void *, size_t);
+void	diffdir(char *, char *, int);
+void	print_only(const char *, size_t, const char *);
+void	print_status(int, char *, char *, char *);
diff --git a/lib/got_lib_fileindex.h b/lib/got_lib_fileindex.h
new file mode 100644
index 0000000..018f4f2
--- /dev/null
+++ b/lib/got_lib_fileindex.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * State information for a tracked file in a work tree.
+ * When written to disk, multi-byte fields are written in big-endian.
+ * Some fields are based on results from stat(2). These are only used in
+ * order to detect modifications made to on-disk files, they are never
+ * applied back to the filesystem.
+ */
+struct got_fileindex_entry {
+	TAILQ_ENTRY(got_fileindex_entry) entry;
+	uint64_t ctime_sec;
+	uint64_t ctime_nsec;
+	uint64_t mtime_sec;
+	uint64_t mtime_nsec;
+	uint32_t uid;
+	uint32_t gid;
+	/*
+	 * On-disk size is truncated to the lower 32 bits.
+	 * The value is only used to check for modifications anyway.
+	 */
+	uint32_t size;
+
+	uint16_t mode;
+#define GOT_INDEX_ENTRY_MODE_FILE_TYPE		0x000f
+#define GOT_INDEX_ENTRY_MODE_REGULAR_FILE	1
+#define GOT_INDEX_ENTRY_MODE_SYMLINK		2
+#define GOT_INDEX_ENTRY_MODE_PERMS		0xff10
+#define GOT_INDEX_ENTRY_MODE_PERMS_SHIFT	4
+
+	/* SHA1 of corresponding blob in repository. */
+	uint8_t blob_sha1[SHA1_DIGEST_LENGTH];
+
+	uint32_t flags;
+#define GOT_INDEX_ENTRY_F_PATH_LEN	0x00000fff
+#define GOT_INDEX_ENTRY_F_STAGE		0x00003000
+#define GOT_INDEX_ENTRY_F_EXTENDED	0x00004000
+#define GOT_INDEX_ENTRY_F_ASSUME_VALID	0x00008000
+
+	/*
+	 * UNIX-style path, relative to work tree root.
+	 * Variable length, and NUL-padded to a multiple of 8 on disk.
+	 */
+	char *path;
+
+	/* More data could be here if F_EXTENDED is set; To be determined... */
+};
+
+/* "Stages" of a file afflicted by a 3-way merge conflict. */
+#define GOT_INDEX_ENTRY_STAGE_MERGED	0
+#define GOT_INDEX_ENTRY_STAGE_ANCESTOR	1
+#define GOT_INDEX_ENTRY_STAGE_OURS	2
+#define GOT_INDEX_ENTRY_STAGE_THEIRS	3
+
+struct got_fileindex {
+	uint32_t nentries;
+	TAILQ_HEAD(, got_fileindex_entry) entries;
+};
+
+/* On-disk file index header structure. */
+struct got_fileindex_hdr {
+	uint32_t signature;	/* big-endian */
+#define GOT_FILE_INDEX_SIGNATURE	0x676f7449 /* 'g', 'o', 't', 'I' */
+	uint32_t version;	/* big-endian */
+#define GOT_FILE_INDEX_VERSION	1
+	uint32_t nentries;	/* big-endian */
+	/* list of concatenated fileindex entries */
+	uint8_t sha1[SHA1_DIGEST_LENGTH]; /* checksum of above on-disk data */
+};
+
+const struct got_error *got_fileindex_entry_open(struct got_fileindex_entry **,
+    const char *, const char *, uint8_t *);
+void got_fileindex_entry_close(struct got_fileindex_entry *);
+struct got_fileindex *got_fileindex_open(void);
+void got_fileindex_close(struct got_fileindex *);
+const struct got_error *got_fileindex_write(struct got_fileindex *, FILE *);
+const struct got_error *got_fileindex_entry_add(struct got_fileindex *,
+    struct got_fileindex_entry *);
diff --git a/lib/got_lib_object.h b/lib/got_lib_object.h
new file mode 100644
index 0000000..156901f
--- /dev/null
+++ b/lib/got_lib_object.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+struct got_object_id {
+	u_int8_t sha1[SHA1_DIGEST_LENGTH];
+};
+
+struct got_object {
+	int type;
+	int flags;
+#define GOT_OBJ_FLAG_PACKED		0x01
+#define GOT_OBJ_FLAG_DELTIFIED		0x02
+
+	size_t hdrlen;
+	size_t size;
+	struct got_object_id id;
+
+	char *path_packfile;	/* if packed */
+	off_t pack_offset;	/* if packed */
+	struct got_delta_chain deltas; /* if deltified */
+};
+
+struct got_blob_object {
+	FILE *f;
+	struct got_zstream_buf zb;
+	size_t hdrlen;
+	size_t blocksize;
+	uint8_t *read_buf;
+	int flags;
+#define GOT_BLOB_F_COMPRESSED	0x01
+	struct got_object_id id;
+};
diff --git a/lib/got_lib_pack.h b/lib/got_lib_pack.h
new file mode 100644
index 0000000..497c9c2
--- /dev/null
+++ b/lib/got_lib_pack.h
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* An open pack file. */
+struct got_pack {
+	char *path_packfile;
+	FILE *packfile;
+	size_t filesize;
+};
+
+void got_pack_close(struct got_pack *);
+
+/* See Documentation/technical/pack-format.txt in Git. */
+
+struct got_packidx_trailer {
+	u_int8_t	packfile_sha1[SHA1_DIGEST_LENGTH];
+	u_int8_t	packidx_sha1[SHA1_DIGEST_LENGTH];
+} __attribute__((__packed__));
+
+/* Ignore pack index version 1 which is no longer written by Git. */
+#define GOT_PACKIDX_VERSION 2
+
+struct got_packidx_v2_hdr {
+	uint32_t	magic;		/* big endian */
+#define GOT_PACKIDX_V2_MAGIC 0xff744f63	/* "\377t0c" */
+	uint32_t	version;
+
+	/* 
+	 * Each entry N in the fanout table contains the number of objects in
+	 * the packfile whose SHA1 begins with a byte less than or equal to N.
+	 * The last entry (index 255) contains the number of objects in the
+	 * pack file whose first SHA1 byte is <= 0xff, and thus records the
+	 * total number of objects in the pack file. All pointer variables
+	 * below point to tables with a corresponding number of entries.
+	 */
+	uint32_t	fanout_table[0xff + 1];	/* values are big endian */
+
+	/* Sorted SHA1 checksums for each object in the pack file. */
+	struct got_object_id *sorted_ids;
+
+	/* CRC32 of the packed representation of each object. */
+	uint32_t	*crc32;
+
+	/* Offset into the pack file for each object. */
+	uint32_t	*offsets;		/* values are big endian */
+#define GOT_PACKIDX_OFFSET_VAL_MASK		0x7fffffff
+#define GOT_PACKIDX_OFFSET_VAL_IS_LARGE_IDX	0x80000000
+
+	/* Large offsets table is empty for pack files < 2 GB. */
+	uint64_t	*large_offsets;		/* values are big endian */
+
+	struct got_packidx_trailer trailer;
+};
+
+struct got_packfile_hdr {
+	uint32_t	signature;
+#define GOT_PACKFILE_SIGNATURE	0x5041434b	/* 'P' 'A' 'C' 'K' */
+	uint32_t	version;	/* big endian */
+#define GOT_PACKFILE_VERSION 2
+	uint32_t	nobjects;	/* big endian */
+};
+
+struct got_packfile_obj_hdr {
+	/* 
+	 * The object size field uses a variable length encoding:
+	 * size0...sizeN form a 4+7+7+...+7 bit integer, where size0 is the
+	 * least significant part and sizeN is the most significant part.
+	 * If the MSB of a size byte is set, an additional size byte follows.
+	 * Of the 7 remaining bits of size0, the first 3 bits indicate the
+	 * object's type, and the remaining 4 bits contribute to the size.
+	 */
+	uint8_t *size;		/* variable length */
+#define GOT_PACK_OBJ_SIZE_MORE		0x80
+#define GOT_PACK_OBJ_SIZE0_TYPE_MASK	0x70 /* See struct got_object->type */
+#define GOT_PACK_OBJ_SIZE0_TYPE_MASK_SHIFT	4
+#define GOT_PACK_OBJ_SIZE0_VAL_MASK	0x0f
+#define GOT_PACK_OBJ_SIZE_VAL_MASK	0x7f
+};
+
+/* If object is not a DELTA type. */
+struct got_packfile_object_data {
+	uint8_t *data;	/* compressed */
+};
+
+/* If object is of type	GOT_OBJ_TYPE_REF_DELTA. */
+struct got_packfile_object_data_ref_delta {
+	uint8_t sha1[SHA1_DIGEST_LENGTH];
+	uint8_t *delta_data;		/* compressed */
+};
+
+/* If object is of type GOT_OBJ_TYPE_OFFSET_DELTA. */
+struct got_packfile_object_data_offset_delta {
+	/* 
+	 * This offset is interpreted as a negative offset from
+	 * the got_packfile_obj_hdr corresponding to this object.
+	 * The size provided in the header specifies the amount
+	 * of compressed delta data that follows.
+	 *
+	 * This field uses a variable length encoding of N bytes,
+	 * where the MSB is always set except for the last byte.
+	 * The value is encoded as a series of N 7 bit integers,
+	 * which are concatenated, and if N > 1 the value 2^7 +
+	 * 2^14 + ... + 2^(7 * (n-1)) is added to the result.
+	 */
+	uint8_t *offset;	/* variable length */
+#define GOT_PACK_OBJ_DELTA_OFF_MORE		0x80
+#define GOT_PACK_OBJ_DELTA_OFF_VAL_MASK		0x7f
+	uint8_t *delta_data;		/* compressed */
+};
+
+struct got_packfile_obj_data {
+	union {
+		struct got_packfile_object_data data;
+		struct got_packfile_object_data_ref_delta ref_delta;
+		struct got_packfile_object_data_offset_delta offset_delta;
+	} __attribute__((__packed__));
+} __attribute__((__packed__));
+
+const struct got_error *got_packidx_open(struct got_packidx_v2_hdr **,
+    const char *);
+void got_packidx_close(struct got_packidx_v2_hdr *);
+
+const struct got_error *got_packfile_open_object(struct got_object **,
+    struct got_object_id *, struct got_repository *);
+const struct got_error *got_packfile_extract_object(FILE **,
+    struct got_object *, struct got_repository *);
+const struct got_error *got_packfile_extract_object_to_mem(uint8_t **, size_t *,
+    struct got_object *, struct got_repository *);
diff --git a/lib/got_lib_path.h b/lib/got_lib_path.h
new file mode 100644
index 0000000..53b63ef
--- /dev/null
+++ b/lib/got_lib_path.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* Utilities for dealing with filesystem paths. */
+
+#define GOT_DEFAULT_FILE_MODE	(S_IRUSR|S_IWUSR | S_IRGRP | S_IROTH)
+#define GOT_DEFAULT_DIR_MODE	(S_IRWXU | S_IRGRP|S_IXGRP | S_IROTH|S_IXOTH)
+
+/* Determine whether a path is an absolute path. */
+int got_path_is_absolute(const char *);
+
+/*
+ * Return an absolute version of a relative path.
+ * The result is allocated with malloc(3).
+ */
+char *got_path_get_absolute(const char *);
+
+/* 
+ * Normalize a path for internal processing.
+ * The result is allocated with malloc(3).
+ */
+char *got_path_normalize(const char *);
+
+/* Open a new temporary file for writing.
+ * The file is not visible in the filesystem. */
+FILE *got_opentemp(void);
+
+/* Open a new temporary file for writing.
+ * The file is visible in the filesystem. */
+const struct got_error *got_opentemp_named(char **, FILE **, const char *);
+
+/* Count the number of path segments separated by '/'. */
+const struct got_error *
+got_path_segment_count(int *count, const char *path);
diff --git a/lib/got_lib_repository.h b/lib/got_lib_repository.h
new file mode 100644
index 0000000..683bfdd
--- /dev/null
+++ b/lib/got_lib_repository.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define GOT_PACKIDX_CACHE_SIZE	64
+#define GOT_PACK_CACHE_SIZE	GOT_PACKIDX_CACHE_SIZE
+
+struct got_repository {
+	char *path;
+	char *path_git_dir;
+
+	/* The pack index cache speeds up search for packed objects. */
+	struct got_packidx_v2_hdr *packidx_cache[GOT_PACKIDX_CACHE_SIZE];
+
+	/* Open file handles, memory maps, and cached deltas for pack files. */
+	struct got_pack packs[GOT_PACK_CACHE_SIZE];
+};
diff --git a/lib/got_lib_sha1.h b/lib/got_lib_sha1.h
new file mode 100644
index 0000000..d207ee3
--- /dev/null
+++ b/lib/got_lib_sha1.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define GOT_SHA1_STRING_ZERO "0000000000000000000000000000000000000000"
+
+int got_parse_sha1_digest(uint8_t *, const char *);
+char *got_sha1_digest_to_str(const uint8_t *, char *, size_t);
diff --git a/lib/got_lib_worktree.h b/lib/got_lib_worktree.h
new file mode 100644
index 0000000..5694eae
--- /dev/null
+++ b/lib/got_lib_worktree.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+struct got_worktree {
+	char *root_path;
+	char *repo_path;
+	char *path_prefix;
+	char *base_commit;
+	char *head_ref;
+
+	/*
+	 * File descriptor for the lock file, open while a work tree is open.
+	 * When a work tree is opened, a shared lock on the lock file is
+	 * acquired with flock(2). This shared lock is held until the work
+	 * tree is closed, i.e. throughout the lifetime of any operation
+	 * which uses a work tree.
+	 * Before any modifications are made to the on-disk state of work
+	 * tree meta data, tracked files, or directory tree structure, this
+	 * shared lock must be upgraded to an exclusive lock.
+	 */
+	int lockfd;
+};
+
+#define GOT_WORKTREE_GOT_DIR		".got"
+#define GOT_WORKTREE_FILE_INDEX		"fileindex"
+#define GOT_WORKTREE_REPOSITORY		"repository"
+#define GOT_WORKTREE_PATH_PREFIX	"path-prefix"
+#define GOT_WORKTREE_HEAD		"head"
+#define GOT_WORKTREE_LOCK		"lock"
+#define GOT_WORKTREE_FORMAT		"format"
+
+#define GOT_WORKTREE_FORMAT_VERSION	1
+#define GOT_WORKTREE_INVALID_COMMIT_ID	GOT_SHA1_STRING_ZERO
diff --git a/lib/got_lib_zbuf.h b/lib/got_lib_zbuf.h
new file mode 100644
index 0000000..9285ed5
--- /dev/null
+++ b/lib/got_lib_zbuf.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+struct got_zstream_buf {
+	z_stream z;
+	char *inbuf;
+	size_t inlen;
+	char *outbuf;
+	size_t outlen;
+	int flags;
+#define GOT_ZSTREAM_F_HAVE_MORE		0x01
+#define GOT_ZSTREAM_F_OWN_OUTBUF	0x02
+};
+
+#define GOT_ZSTREAM_BUFSIZE		8192
+
+const struct got_error *got_inflate_init(struct got_zstream_buf *, uint8_t *,
+    size_t);
+const struct got_error *got_inflate_read(struct got_zstream_buf *, FILE *,
+    size_t *);
+void got_inflate_end(struct got_zstream_buf *);
+const struct got_error *got_inflate_to_mem(uint8_t **, size_t *, FILE *);
+const struct got_error *got_inflate_to_file(size_t *, FILE *, FILE *);
diff --git a/lib/got_object_lib.h b/lib/got_object_lib.h
deleted file mode 100644
index 156901f..0000000
--- a/lib/got_object_lib.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-struct got_object_id {
-	u_int8_t sha1[SHA1_DIGEST_LENGTH];
-};
-
-struct got_object {
-	int type;
-	int flags;
-#define GOT_OBJ_FLAG_PACKED		0x01
-#define GOT_OBJ_FLAG_DELTIFIED		0x02
-
-	size_t hdrlen;
-	size_t size;
-	struct got_object_id id;
-
-	char *path_packfile;	/* if packed */
-	off_t pack_offset;	/* if packed */
-	struct got_delta_chain deltas; /* if deltified */
-};
-
-struct got_blob_object {
-	FILE *f;
-	struct got_zstream_buf zb;
-	size_t hdrlen;
-	size_t blocksize;
-	uint8_t *read_buf;
-	int flags;
-#define GOT_BLOB_F_COMPRESSED	0x01
-	struct got_object_id id;
-};
diff --git a/lib/got_pack_lib.h b/lib/got_pack_lib.h
deleted file mode 100644
index 497c9c2..0000000
--- a/lib/got_pack_lib.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* An open pack file. */
-struct got_pack {
-	char *path_packfile;
-	FILE *packfile;
-	size_t filesize;
-};
-
-void got_pack_close(struct got_pack *);
-
-/* See Documentation/technical/pack-format.txt in Git. */
-
-struct got_packidx_trailer {
-	u_int8_t	packfile_sha1[SHA1_DIGEST_LENGTH];
-	u_int8_t	packidx_sha1[SHA1_DIGEST_LENGTH];
-} __attribute__((__packed__));
-
-/* Ignore pack index version 1 which is no longer written by Git. */
-#define GOT_PACKIDX_VERSION 2
-
-struct got_packidx_v2_hdr {
-	uint32_t	magic;		/* big endian */
-#define GOT_PACKIDX_V2_MAGIC 0xff744f63	/* "\377t0c" */
-	uint32_t	version;
-
-	/* 
-	 * Each entry N in the fanout table contains the number of objects in
-	 * the packfile whose SHA1 begins with a byte less than or equal to N.
-	 * The last entry (index 255) contains the number of objects in the
-	 * pack file whose first SHA1 byte is <= 0xff, and thus records the
-	 * total number of objects in the pack file. All pointer variables
-	 * below point to tables with a corresponding number of entries.
-	 */
-	uint32_t	fanout_table[0xff + 1];	/* values are big endian */
-
-	/* Sorted SHA1 checksums for each object in the pack file. */
-	struct got_object_id *sorted_ids;
-
-	/* CRC32 of the packed representation of each object. */
-	uint32_t	*crc32;
-
-	/* Offset into the pack file for each object. */
-	uint32_t	*offsets;		/* values are big endian */
-#define GOT_PACKIDX_OFFSET_VAL_MASK		0x7fffffff
-#define GOT_PACKIDX_OFFSET_VAL_IS_LARGE_IDX	0x80000000
-
-	/* Large offsets table is empty for pack files < 2 GB. */
-	uint64_t	*large_offsets;		/* values are big endian */
-
-	struct got_packidx_trailer trailer;
-};
-
-struct got_packfile_hdr {
-	uint32_t	signature;
-#define GOT_PACKFILE_SIGNATURE	0x5041434b	/* 'P' 'A' 'C' 'K' */
-	uint32_t	version;	/* big endian */
-#define GOT_PACKFILE_VERSION 2
-	uint32_t	nobjects;	/* big endian */
-};
-
-struct got_packfile_obj_hdr {
-	/* 
-	 * The object size field uses a variable length encoding:
-	 * size0...sizeN form a 4+7+7+...+7 bit integer, where size0 is the
-	 * least significant part and sizeN is the most significant part.
-	 * If the MSB of a size byte is set, an additional size byte follows.
-	 * Of the 7 remaining bits of size0, the first 3 bits indicate the
-	 * object's type, and the remaining 4 bits contribute to the size.
-	 */
-	uint8_t *size;		/* variable length */
-#define GOT_PACK_OBJ_SIZE_MORE		0x80
-#define GOT_PACK_OBJ_SIZE0_TYPE_MASK	0x70 /* See struct got_object->type */
-#define GOT_PACK_OBJ_SIZE0_TYPE_MASK_SHIFT	4
-#define GOT_PACK_OBJ_SIZE0_VAL_MASK	0x0f
-#define GOT_PACK_OBJ_SIZE_VAL_MASK	0x7f
-};
-
-/* If object is not a DELTA type. */
-struct got_packfile_object_data {
-	uint8_t *data;	/* compressed */
-};
-
-/* If object is of type	GOT_OBJ_TYPE_REF_DELTA. */
-struct got_packfile_object_data_ref_delta {
-	uint8_t sha1[SHA1_DIGEST_LENGTH];
-	uint8_t *delta_data;		/* compressed */
-};
-
-/* If object is of type GOT_OBJ_TYPE_OFFSET_DELTA. */
-struct got_packfile_object_data_offset_delta {
-	/* 
-	 * This offset is interpreted as a negative offset from
-	 * the got_packfile_obj_hdr corresponding to this object.
-	 * The size provided in the header specifies the amount
-	 * of compressed delta data that follows.
-	 *
-	 * This field uses a variable length encoding of N bytes,
-	 * where the MSB is always set except for the last byte.
-	 * The value is encoded as a series of N 7 bit integers,
-	 * which are concatenated, and if N > 1 the value 2^7 +
-	 * 2^14 + ... + 2^(7 * (n-1)) is added to the result.
-	 */
-	uint8_t *offset;	/* variable length */
-#define GOT_PACK_OBJ_DELTA_OFF_MORE		0x80
-#define GOT_PACK_OBJ_DELTA_OFF_VAL_MASK		0x7f
-	uint8_t *delta_data;		/* compressed */
-};
-
-struct got_packfile_obj_data {
-	union {
-		struct got_packfile_object_data data;
-		struct got_packfile_object_data_ref_delta ref_delta;
-		struct got_packfile_object_data_offset_delta offset_delta;
-	} __attribute__((__packed__));
-} __attribute__((__packed__));
-
-const struct got_error *got_packidx_open(struct got_packidx_v2_hdr **,
-    const char *);
-void got_packidx_close(struct got_packidx_v2_hdr *);
-
-const struct got_error *got_packfile_open_object(struct got_object **,
-    struct got_object_id *, struct got_repository *);
-const struct got_error *got_packfile_extract_object(FILE **,
-    struct got_object *, struct got_repository *);
-const struct got_error *got_packfile_extract_object_to_mem(uint8_t **, size_t *,
-    struct got_object *, struct got_repository *);
diff --git a/lib/got_path_lib.h b/lib/got_path_lib.h
deleted file mode 100644
index 53b63ef..0000000
--- a/lib/got_path_lib.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* Utilities for dealing with filesystem paths. */
-
-#define GOT_DEFAULT_FILE_MODE	(S_IRUSR|S_IWUSR | S_IRGRP | S_IROTH)
-#define GOT_DEFAULT_DIR_MODE	(S_IRWXU | S_IRGRP|S_IXGRP | S_IROTH|S_IXOTH)
-
-/* Determine whether a path is an absolute path. */
-int got_path_is_absolute(const char *);
-
-/*
- * Return an absolute version of a relative path.
- * The result is allocated with malloc(3).
- */
-char *got_path_get_absolute(const char *);
-
-/* 
- * Normalize a path for internal processing.
- * The result is allocated with malloc(3).
- */
-char *got_path_normalize(const char *);
-
-/* Open a new temporary file for writing.
- * The file is not visible in the filesystem. */
-FILE *got_opentemp(void);
-
-/* Open a new temporary file for writing.
- * The file is visible in the filesystem. */
-const struct got_error *got_opentemp_named(char **, FILE **, const char *);
-
-/* Count the number of path segments separated by '/'. */
-const struct got_error *
-got_path_segment_count(int *count, const char *path);
diff --git a/lib/got_repository_lib.h b/lib/got_repository_lib.h
deleted file mode 100644
index 683bfdd..0000000
--- a/lib/got_repository_lib.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define GOT_PACKIDX_CACHE_SIZE	64
-#define GOT_PACK_CACHE_SIZE	GOT_PACKIDX_CACHE_SIZE
-
-struct got_repository {
-	char *path;
-	char *path_git_dir;
-
-	/* The pack index cache speeds up search for packed objects. */
-	struct got_packidx_v2_hdr *packidx_cache[GOT_PACKIDX_CACHE_SIZE];
-
-	/* Open file handles, memory maps, and cached deltas for pack files. */
-	struct got_pack packs[GOT_PACK_CACHE_SIZE];
-};
diff --git a/lib/got_sha1_lib.h b/lib/got_sha1_lib.h
deleted file mode 100644
index d207ee3..0000000
--- a/lib/got_sha1_lib.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define GOT_SHA1_STRING_ZERO "0000000000000000000000000000000000000000"
-
-int got_parse_sha1_digest(uint8_t *, const char *);
-char *got_sha1_digest_to_str(const uint8_t *, char *, size_t);
diff --git a/lib/got_worktree_lib.h b/lib/got_worktree_lib.h
deleted file mode 100644
index 5694eae..0000000
--- a/lib/got_worktree_lib.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-struct got_worktree {
-	char *root_path;
-	char *repo_path;
-	char *path_prefix;
-	char *base_commit;
-	char *head_ref;
-
-	/*
-	 * File descriptor for the lock file, open while a work tree is open.
-	 * When a work tree is opened, a shared lock on the lock file is
-	 * acquired with flock(2). This shared lock is held until the work
-	 * tree is closed, i.e. throughout the lifetime of any operation
-	 * which uses a work tree.
-	 * Before any modifications are made to the on-disk state of work
-	 * tree meta data, tracked files, or directory tree structure, this
-	 * shared lock must be upgraded to an exclusive lock.
-	 */
-	int lockfd;
-};
-
-#define GOT_WORKTREE_GOT_DIR		".got"
-#define GOT_WORKTREE_FILE_INDEX		"fileindex"
-#define GOT_WORKTREE_REPOSITORY		"repository"
-#define GOT_WORKTREE_PATH_PREFIX	"path-prefix"
-#define GOT_WORKTREE_HEAD		"head"
-#define GOT_WORKTREE_LOCK		"lock"
-#define GOT_WORKTREE_FORMAT		"format"
-
-#define GOT_WORKTREE_FORMAT_VERSION	1
-#define GOT_WORKTREE_INVALID_COMMIT_ID	GOT_SHA1_STRING_ZERO
diff --git a/lib/got_zbuf_lib.h b/lib/got_zbuf_lib.h
deleted file mode 100644
index 9285ed5..0000000
--- a/lib/got_zbuf_lib.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-struct got_zstream_buf {
-	z_stream z;
-	char *inbuf;
-	size_t inlen;
-	char *outbuf;
-	size_t outlen;
-	int flags;
-#define GOT_ZSTREAM_F_HAVE_MORE		0x01
-#define GOT_ZSTREAM_F_OWN_OUTBUF	0x02
-};
-
-#define GOT_ZSTREAM_BUFSIZE		8192
-
-const struct got_error *got_inflate_init(struct got_zstream_buf *, uint8_t *,
-    size_t);
-const struct got_error *got_inflate_read(struct got_zstream_buf *, FILE *,
-    size_t *);
-void got_inflate_end(struct got_zstream_buf *);
-const struct got_error *got_inflate_to_mem(uint8_t **, size_t *, FILE *);
-const struct got_error *got_inflate_to_file(size_t *, FILE *, FILE *);
diff --git a/lib/object.c b/lib/object.c
index f5cf92a..7037325 100644
--- a/lib/object.c
+++ b/lib/object.c
@@ -30,11 +30,11 @@
 #include "got_object.h"
 #include "got_repository.h"
 
-#include "got_sha1_lib.h"
-#include "got_delta_lib.h"
-#include "got_pack_lib.h"
-#include "got_zbuf_lib.h"
-#include "got_object_lib.h"
+#include "got_lib_sha1.h"
+#include "got_lib_delta.h"
+#include "got_lib_pack.h"
+#include "got_lib_zbuf.h"
+#include "got_lib_object.h"
 
 #ifndef MIN
 #define	MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
diff --git a/lib/pack.c b/lib/pack.c
index 98c06d2..13400cd 100644
--- a/lib/pack.c
+++ b/lib/pack.c
@@ -34,13 +34,13 @@
 #include "got_object.h"
 #include "got_repository.h"
 
-#include "got_sha1_lib.h"
-#include "got_pack_lib.h"
-#include "got_path_lib.h"
-#include "got_delta_lib.h"
-#include "got_zbuf_lib.h"
-#include "got_object_lib.h"
-#include "got_repository_lib.h"
+#include "got_lib_sha1.h"
+#include "got_lib_pack.h"
+#include "got_lib_path.h"
+#include "got_lib_delta.h"
+#include "got_lib_zbuf.h"
+#include "got_lib_object.h"
+#include "got_lib_repository.h"
 
 #ifndef nitems
 #define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
diff --git a/lib/path.c b/lib/path.c
index 2359a13..ddd0a1e 100644
--- a/lib/path.c
+++ b/lib/path.c
@@ -22,7 +22,7 @@
 
 #include "got_error.h"
 
-#include "got_path_lib.h"
+#include "got_lib_path.h"
 
 int
 got_path_is_absolute(const char *path)
diff --git a/lib/refs.c b/lib/refs.c
index 4a5ef20..07d6b87 100644
--- a/lib/refs.c
+++ b/lib/refs.c
@@ -29,11 +29,11 @@
 #include "got_repository.h"
 #include "got_refs.h"
 
-#include "got_sha1_lib.h"
-#include "got_path_lib.h"
-#include "got_delta_lib.h"
-#include "got_zbuf_lib.h"
-#include "got_object_lib.h"
+#include "got_lib_sha1.h"
+#include "got_lib_path.h"
+#include "got_lib_delta.h"
+#include "got_lib_zbuf.h"
+#include "got_lib_object.h"
 
 /* A symbolic reference. */
 struct got_symref {
diff --git a/lib/repository.c b/lib/repository.c
index d1aca1b..9dea7fe 100644
--- a/lib/repository.c
+++ b/lib/repository.c
@@ -28,12 +28,12 @@
 #include "got_refs.h"
 #include "got_repository.h"
 
-#include "got_path_lib.h"
-#include "got_delta_lib.h"
-#include "got_zbuf_lib.h"
-#include "got_object_lib.h"
-#include "got_pack_lib.h"
-#include "got_repository_lib.h"
+#include "got_lib_path.h"
+#include "got_lib_delta.h"
+#include "got_lib_zbuf.h"
+#include "got_lib_object.h"
+#include "got_lib_pack.h"
+#include "got_lib_repository.h"
 
 #ifndef nitems
 #define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
diff --git a/lib/sha1.c b/lib/sha1.c
index 86810c7..d5e11f0 100644
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <limits.h>
 
-#include "got_sha1_lib.h"
+#include "got_lib_sha1.h"
 
 static int
 parse_xdigit(uint8_t *val, const char *hex)
diff --git a/lib/worktree.c b/lib/worktree.c
index a1bff6f..63c5da8 100644
--- a/lib/worktree.c
+++ b/lib/worktree.c
@@ -34,13 +34,13 @@
 #include "got_object.h"
 #include "got_worktree.h"
 
-#include "got_worktree_lib.h"
-#include "got_path_lib.h"
-#include "got_sha1_lib.h"
-#include "got_fileindex_lib.h"
-#include "got_zbuf_lib.h"
-#include "got_delta_lib.h"
-#include "got_object_lib.h"
+#include "got_lib_worktree.h"
+#include "got_lib_path.h"
+#include "got_lib_sha1.h"
+#include "got_lib_fileindex.h"
+#include "got_lib_zbuf.h"
+#include "got_lib_delta.h"
+#include "got_lib_object.h"
 
 #ifndef MIN
 #define	MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
diff --git a/lib/zbuf.c b/lib/zbuf.c
index cf71b54..9024264 100644
--- a/lib/zbuf.c
+++ b/lib/zbuf.c
@@ -25,8 +25,8 @@
 #include "got_error.h"
 #include "got_object.h"
 
-#include "got_path_lib.h"
-#include "got_zbuf_lib.h"
+#include "got_lib_path.h"
+#include "got_lib_zbuf.h"
 
 const struct got_error *
 got_inflate_init(struct got_zstream_buf *zb, uint8_t *outbuf, size_t bufsize)
diff --git a/regress/delta/delta_test.c b/regress/delta/delta_test.c
index 1486b9c..b4272d3 100644
--- a/regress/delta/delta_test.c
+++ b/regress/delta/delta_test.c
@@ -24,8 +24,8 @@
 
 #include "got_error.h"
 
-#include "got_delta_lib.h"
-#include "got_path_lib.h"
+#include "got_lib_delta.h"
+#include "got_lib_path.h"
 
 #ifndef nitems
 #define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
diff --git a/regress/worktree/worktree_test.c b/regress/worktree/worktree_test.c
index a6f98b4..4fbb888 100644
--- a/regress/worktree/worktree_test.c
+++ b/regress/worktree/worktree_test.c
@@ -35,8 +35,8 @@
 #include "got_repository.h"
 #include "got_worktree.h"
 
-#include "got_worktree_lib.h"
-#include "got_path_lib.h"
+#include "got_lib_worktree.h"
+#include "got_lib_path.h"
 
 #define GOT_REPO_PATH "../../../"