Mercurial > projects > pwm
annotate pwfile.c @ 9:60c8ab006e55
Update metadata
Update password file metadata when saving.
Add and update metadata when creating and modifying records.
author | Guido Berhoerster <guido+pwm@berhoerster.name> |
---|---|
date | Fri, 28 Jul 2017 09:53:46 +0200 |
parents | 0b1bce8db371 |
children | 17fb30016e64 |
rev | line source |
---|---|
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
1 /* |
9
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
2 * Copyright (C) 2017 Guido Berhoerster <guido+pwm@berhoerster.name> |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
3 * |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
4 * Permission is hereby granted, free of charge, to any person obtaining |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
5 * a copy of this software and associated documentation files (the |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
6 * "Software"), to deal in the Software without restriction, including |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
7 * without limitation the rights to use, copy, modify, merge, publish, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
8 * distribute, sublicense, and/or sell copies of the Software, and to |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
9 * permit persons to whom the Software is furnished to do so, subject to |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
10 * the following conditions: |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
11 * |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
12 * The above copyright notice and this permission notice shall be included |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
13 * in all copies or substantial portions of the Software. |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
14 * |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
15 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
16 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
17 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
18 * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
19 * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
20 * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
21 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
22 */ |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
23 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
24 #include "compat.h" |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
25 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
26 #ifdef HAVE_ERR_H |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
27 #include <err.h> |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
28 #endif /* HAVE_ERR_H */ |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
29 #include <errno.h> |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
30 #include <stdio.h> |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
31 #include <string.h> |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
32 #include <sys/stat.h> |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
33 #ifdef HAVE_SYS_TREE_H |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
34 #include <sys/tree.h> |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
35 #endif |
9
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
36 #include <sys/utsname.h> |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
37 #include <unistd.h> |
9
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
38 #include <time.h> |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
39 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
40 #include "pwfile.h" |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
41 #include "util.h" |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
42 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
43 struct record_id_entry { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
44 RB_ENTRY(record_id_entry) record_id_entry; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
45 unsigned int id; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
46 unsigned char uuid[PWS3_UUID_SIZE]; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
47 }; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
48 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
49 RB_HEAD(record_id_tree, record_id_entry); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
50 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
51 static int record_id_entry_cmp(struct record_id_entry *, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
52 struct record_id_entry *); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
53 RB_PROTOTYPE_STATIC(record_id_tree, record_id_entry, record_id_entry, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
54 record_id_entry_cmp) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
55 RB_GENERATE_STATIC(record_id_tree, record_id_entry, record_id_entry, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
56 record_id_entry_cmp) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
57 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
58 static int |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
59 record_id_entry_cmp(struct record_id_entry *entry1, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
60 struct record_id_entry *entry2) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
61 { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
62 if (entry1->id > entry2->id) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
63 return (-1); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
64 } else if (entry1->id < entry2->id) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
65 return (1); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
66 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
67 return (0); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
68 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
69 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
70 static int |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
71 pws_record_cmp(const void *p1, const void *p2) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
72 { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
73 int retval; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
74 struct pws3_record *record1 = *(struct pws3_record **)p1; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
75 struct pws3_record *record2 = *(struct pws3_record **)p2; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
76 struct pws3_field *group_field1; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
77 const char *group1; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
78 struct pws3_field *group_field2; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
79 const char *group2; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
80 struct pws3_field *title_field1; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
81 const char *title1; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
82 struct pws3_field *title_field2; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
83 const char *title2; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
84 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
85 group_field1 = pws3_record_get_field(record1, PWS3_RECORD_FIELD_GROUP); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
86 group1 = (group_field1 != NULL) ? pws3_field_get_text(group_field1) : |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
87 ""; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
88 group_field2 = pws3_record_get_field(record2, PWS3_RECORD_FIELD_GROUP); |
2
5cd0debdb7d8
Fix a typo potentially causing a NULL pointer dereference
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
0
diff
changeset
|
89 group2 = (group_field2 != NULL) ? pws3_field_get_text(group_field2) : |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
90 ""; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
91 retval = strcmp(group1, group2); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
92 if (retval != 0) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
93 return (retval); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
94 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
95 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
96 title_field1 = pws3_record_get_field(record1, PWS3_RECORD_FIELD_TITLE); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
97 title1 = (title_field1 != NULL) ? pws3_field_get_text(title_field1) : |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
98 ""; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
99 title_field2 = pws3_record_get_field(record2, PWS3_RECORD_FIELD_TITLE); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
100 title2 = (title_field2 != NULL) ? pws3_field_get_text(title_field2) : |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
101 ""; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
102 return (strcmp(title1, title2)); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
103 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
104 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
105 static void |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
106 record_id_tree_clear(struct record_id_tree *tree) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
107 { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
108 struct record_id_entry *entry; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
109 struct record_id_entry *entry_tmp; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
110 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
111 RB_FOREACH_SAFE(entry, record_id_tree, tree, entry_tmp) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
112 RB_REMOVE(record_id_tree, tree, entry); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
113 free(entry); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
114 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
115 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
116 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
117 static void |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
118 record_id_tree_destroy(struct record_id_tree *tree) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
119 { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
120 if (tree == NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
121 return; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
122 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
123 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
124 record_id_tree_clear(tree); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
125 free(tree); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
126 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
127 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
128 static const unsigned char * |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
129 record_id_tree_get_uuid(struct record_id_tree *tree, unsigned int id) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
130 { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
131 struct record_id_entry *entry; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
132 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
133 entry = RB_FIND(record_id_tree, tree, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
134 &(struct record_id_entry){ .id = id }); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
135 if (entry == NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
136 return (NULL); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
137 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
138 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
139 return (entry->uuid); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
140 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
141 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
142 void |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
143 pwfile_init(struct pwm_ctx *ctx) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
144 { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
145 ctx->file = pws3_file_create(); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
146 if (ctx->file == NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
147 err(1, "pws3_file_create"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
148 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
149 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
150 ctx->next_id = 1; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
151 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
152 ctx->record_id_tree = xmalloc(sizeof (struct record_id_tree)); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
153 RB_INIT(ctx->record_id_tree); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
154 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
155 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
156 void |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
157 pwfile_destroy(struct pwm_ctx *ctx) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
158 { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
159 record_id_tree_destroy(ctx->record_id_tree); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
160 ctx->record_id_tree = NULL; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
161 pws3_file_destroy(ctx->file); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
162 ctx->file = NULL; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
163 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
164 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
165 int |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
166 pwfile_read_file(struct pwm_ctx *ctx, FILE *fp) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
167 { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
168 struct pws3_record *pws3_record; |
3
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
169 size_t record_list_len = 0; |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
170 struct pws3_record **pws3_record_list; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
171 size_t i; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
172 struct pws3_field *uuid_field; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
173 const unsigned char *uuid; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
174 struct record_id_entry *entry; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
175 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
176 if (pws3_file_read_stream(ctx->file, ctx->password, fp) != 0) { |
5
0b1bce8db371
Prevent misleading double error message
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
4
diff
changeset
|
177 fprintf(stderr, "failed to read password database: %s\n", |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
178 pws3_file_get_error_message(ctx->file)); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
179 return (-1); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
180 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
181 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
182 record_id_tree_clear(ctx->record_id_tree); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
183 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
184 /* sort records by group and title */ |
3
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
185 for (pws3_record = pws3_file_first_record(ctx->file); |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
186 pws3_record != NULL; |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
187 pws3_record = pws3_file_next_record(ctx->file, pws3_record)) { |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
188 record_list_len++; |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
189 } |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
190 pws3_record_list = xmalloc(sizeof (struct pws3_record *) * |
3
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
191 record_list_len); |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
192 for (pws3_record = pws3_file_first_record(ctx->file), i = 0; |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
193 pws3_record != NULL; |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
194 pws3_record = pws3_file_next_record(ctx->file, pws3_record)) { |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
195 pws3_record_list[i++] = pws3_record; |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
196 } |
3
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
197 qsort(pws3_record_list, record_list_len, |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
198 sizeof (struct pws3_record *), pws_record_cmp); |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
199 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
200 /* build the tree of record IDs */ |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
201 for (i = 0; i < record_list_len; i++) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
202 uuid_field = pws3_record_get_field(pws3_record_list[i], |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
203 PWS3_RECORD_FIELD_UUID); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
204 uuid = pws3_field_get_uuid(uuid_field); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
205 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
206 entry = xmalloc(sizeof (struct record_id_entry)); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
207 entry->id = ctx->next_id++; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
208 memcpy(entry->uuid, uuid, sizeof (entry->uuid)); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
209 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
210 RB_INSERT(record_id_tree, ctx->record_id_tree, entry); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
211 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
212 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
213 free(pws3_record_list); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
214 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
215 return (0); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
216 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
217 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
218 static int |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
219 make_backup_copy(const char *filename) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
220 { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
221 int retval = -1; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
222 FILE *fp_orig = NULL; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
223 char *backup_filename = NULL; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
224 char *tmpfilename = NULL; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
225 mode_t old_mode; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
226 int fd_backup = -1; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
227 unsigned char buf[BUFSIZ]; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
228 size_t read_len; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
229 FILE *fp_backup = NULL; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
230 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
231 fp_orig = fopen(filename, "r"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
232 if (fp_orig == NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
233 if (errno != ENOENT) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
234 warn("fopen"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
235 return (-1); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
236 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
237 return (0); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
238 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
239 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
240 xasprintf(&backup_filename, "%s~", filename); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
241 xasprintf(&tmpfilename, "%s.XXXXXX", filename); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
242 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
243 /* create temporary file */ |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
244 old_mode = umask(S_IRWXG | S_IRWXO); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
245 fd_backup = mkstemp(tmpfilename); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
246 umask(old_mode); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
247 if (fd_backup == -1) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
248 warn("mkstemp"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
249 goto out; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
250 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
251 fp_backup = fdopen(fd_backup, "w"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
252 if (fp_backup == NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
253 warn("fdopen"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
254 goto out; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
255 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
256 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
257 /* copy file contents */ |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
258 while (!feof(fp_orig)) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
259 read_len = fread(buf, 1, sizeof (buf), fp_orig); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
260 if ((read_len < sizeof (buf)) && ferror(fp_orig)) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
261 warn("fread"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
262 goto out; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
263 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
264 if (fwrite(buf, 1, read_len, fp_backup) != read_len) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
265 warn("fwrite"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
266 goto out; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
267 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
268 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
269 if (fflush(fp_backup) != 0) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
270 warn("fflush"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
271 goto out; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
272 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
273 if (fsync(fileno(fp_backup)) != 0) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
274 warn("fsync"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
275 goto out; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
276 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
277 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
278 retval = 0; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
279 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
280 out: |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
281 if ((fd_backup != -1) && (fp_backup == NULL)) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
282 close(fd_backup); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
283 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
284 if (fp_backup != NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
285 fclose(fp_backup); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
286 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
287 if (fp_orig != NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
288 fclose(fp_orig); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
289 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
290 if (retval == 0) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
291 /* rename temporary file and overwrite existing file */ |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
292 if (rename(tmpfilename, backup_filename) != 0) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
293 warn("rename"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
294 retval = -1; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
295 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
296 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
297 if ((retval != 0) && ((fd_backup != -1) || (fp_backup != NULL))) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
298 unlink(tmpfilename); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
299 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
300 free(tmpfilename); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
301 free(backup_filename); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
302 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
303 return (retval); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
304 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
305 |
9
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
306 static void |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
307 update_file_metadata(struct pws3_file *file) |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
308 { |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
309 struct pws3_field *save_app_field; |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
310 struct pws3_field *save_timestamp_field; |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
311 char *logname; |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
312 const char default_username[] = "unknown user"; |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
313 const char *username; |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
314 size_t username_len; |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
315 struct utsname utsn; |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
316 const char default_hostname[] = "unknown host"; |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
317 const char *hostname; |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
318 char user_host[1024]; |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
319 struct pws3_field *save_user_host_field; |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
320 struct pws3_field *save_user_field; |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
321 struct pws3_field *save_host_field; |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
322 |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
323 save_app_field = |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
324 pws3_field_create(1, PWS3_HEADER_FIELD_SAVE_APPLICATION); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
325 if (save_app_field == NULL) { |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
326 err(1, "pws3_field_create"); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
327 } |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
328 if (pws3_field_set_text(save_app_field, PACKAGE " V" VERSION) != |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
329 0) { |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
330 err(1, "pws3_field_set_text"); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
331 } |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
332 pws3_file_set_header_field(file, save_app_field); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
333 |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
334 save_timestamp_field = |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
335 pws3_field_create(1, PWS3_HEADER_FIELD_SAVE_TIMESTAMP); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
336 if (save_timestamp_field == NULL) { |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
337 err(1, "pws3_field_create"); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
338 } |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
339 pws3_field_set_time(save_timestamp_field, time(NULL)); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
340 pws3_file_set_header_field(file, save_timestamp_field); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
341 |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
342 logname = getenv("LOGNAME"); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
343 if (logname == NULL) { |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
344 logname = getlogin(); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
345 } |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
346 username = (logname != NULL) ? logname : default_username; |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
347 username_len = MIN(strlen(username), sizeof (user_host) - 4 - 1); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
348 hostname = (uname(&utsn) == 0) ? utsn.nodename : default_hostname; |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
349 snprintf(user_host, sizeof (user_host), "%04zx%s%s", username_len, |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
350 username, hostname); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
351 |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
352 save_user_host_field = |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
353 pws3_field_create(1, PWS3_HEADER_FIELD_SAVE_USER_HOST); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
354 if (save_user_host_field == NULL) { |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
355 err(1, "pws3_field_create"); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
356 } |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
357 if (pws3_field_set_text(save_user_host_field, user_host) != 0) { |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
358 err(1, "pws3_field_set_text"); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
359 } |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
360 pws3_file_set_header_field(file, save_user_host_field); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
361 |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
362 save_user_field = pws3_field_create(1, PWS3_HEADER_FIELD_SAVE_USER); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
363 if (save_user_field == NULL) { |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
364 err(1, "pws3_field_create"); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
365 } |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
366 if (pws3_field_set_text(save_user_field, logname) != 0) { |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
367 err(1, "pws3_field_set_text"); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
368 } |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
369 pws3_file_set_header_field(file, save_user_field); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
370 |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
371 save_host_field = pws3_field_create(1, PWS3_HEADER_FIELD_SAVE_HOST); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
372 if (save_host_field == NULL) { |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
373 err(1, "pws3_field_create"); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
374 } |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
375 if (pws3_field_set_text(save_host_field, hostname) != 0) { |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
376 err(1, "pws3_field_set_text"); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
377 } |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
378 pws3_file_set_header_field(file, save_host_field); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
379 } |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
380 |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
381 int |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
382 pwfile_write_file(struct pwm_ctx *ctx) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
383 { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
384 int retval = -1; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
385 char *tmpfilename = NULL; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
386 mode_t old_mode; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
387 int fd = -1; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
388 FILE *fp = NULL; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
389 |
9
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
390 /* update password file metadata */ |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
391 update_file_metadata(ctx->file); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
392 |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
393 /* make a backup copy of the existing password file */ |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
394 if (make_backup_copy(ctx->filename) != 0) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
395 goto out; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
396 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
397 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
398 xasprintf(&tmpfilename, "%s.XXXXXX", ctx->filename); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
399 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
400 /* create temporary file */ |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
401 old_mode = umask(S_IRWXG | S_IRWXO); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
402 fd = mkstemp(tmpfilename); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
403 if (fd == -1) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
404 warn("mkstemp"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
405 goto out; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
406 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
407 umask(old_mode); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
408 fp = fdopen(fd, "w"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
409 if (fp == NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
410 warn("fdopen"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
411 goto out; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
412 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
413 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
414 /* write contents */ |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
415 if (pws3_file_write_stream(ctx->file, ctx->password, 10000, fp) != 0) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
416 warnx("pws3_file_write_stream: %s", |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
417 pws3_file_get_error_message(ctx->file)); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
418 goto out; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
419 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
420 if (fflush(fp) != 0) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
421 warn("fflush"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
422 goto out; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
423 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
424 if (fsync(fileno(fp)) != 0) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
425 warn("fsync"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
426 goto out; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
427 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
428 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
429 retval = 0; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
430 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
431 out: |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
432 if ((fd != -1) && (fp == NULL)) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
433 close(fd); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
434 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
435 if (fp != NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
436 fclose(fp); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
437 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
438 if (retval == 0) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
439 /* rename temporary file and overwrite existing file */ |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
440 if (rename(tmpfilename, ctx->filename) != 0) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
441 warn("rename"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
442 retval = -1; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
443 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
444 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
445 if ((retval != 0) && ((fd != -1) || (fp != NULL))) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
446 unlink(tmpfilename); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
447 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
448 free(tmpfilename); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
449 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
450 return (retval); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
451 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
452 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
453 static int |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
454 list_item_cmp(const void *p1, const void *p2) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
455 { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
456 int retval; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
457 const union list_item *item1 = *(const union list_item **)p1; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
458 const union list_item *item2 = *(const union list_item **)p2; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
459 const char *group1; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
460 const char *group2; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
461 const char *title1; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
462 const char *title2; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
463 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
464 /* sort both groups and records first by group name */ |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
465 group1 = (item1->any.group != NULL) ? item1->any.group : ""; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
466 group2 = (item2->any.group != NULL) ? item2->any.group : ""; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
467 retval = strcmp(group1, group2); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
468 if ((retval != 0) || ((item1->any.type == ITEM_TYPE_GROUP) && |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
469 (item2->any.type == ITEM_TYPE_GROUP))) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
470 return (retval); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
471 } else if ((item1->any.type == ITEM_TYPE_GROUP) && |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
472 (item2->any.type == ITEM_TYPE_RECORD)) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
473 /* groups come before records belonging to it */ |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
474 return (-1); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
475 } else if ((item1->any.type == ITEM_TYPE_RECORD) && |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
476 (item2->any.type == ITEM_TYPE_GROUP)) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
477 return (1); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
478 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
479 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
480 /* sort records also by title */ |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
481 title1 = (item1->record.title != NULL) ? item1->record.title : ""; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
482 title2 = (item2->record.title != NULL) ? item2->record.title : ""; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
483 return (strcmp(title1, title2)); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
484 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
485 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
486 union list_item ** |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
487 pwfile_create_list(struct pwm_ctx *ctx) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
488 { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
489 union list_item **list; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
490 struct record_id_entry *entry; |
3
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
491 size_t list_capacity = 0; |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
492 struct pws3_field *empty_group_field; |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
493 struct pws3_record *pws3_record; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
494 struct pws3_field *group_field; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
495 const char *group; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
496 struct pws3_field *title_field; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
497 const char *title; |
3
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
498 union list_item *item; |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
499 size_t list_len = 0; |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
500 size_t i; |
3
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
501 size_t j; |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
502 const char *prev_group = NULL; |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
503 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
504 RB_FOREACH(entry, record_id_tree, ctx->record_id_tree) { |
3
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
505 list_capacity++; |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
506 } |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
507 list_capacity *= 2; /* maximum number of group items */ |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
508 for (empty_group_field = pws3_file_first_empty_group(ctx->file); |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
509 empty_group_field != NULL; |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
510 empty_group_field = pws3_file_next_empty_group(ctx->file, |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
511 empty_group_field)) { |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
512 list_capacity++; |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
513 } |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
514 list_capacity++; /* terminating NULL */ |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
515 list = xmalloc(sizeof (union list_item *) * list_capacity); |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
516 |
3
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
517 RB_FOREACH(entry, record_id_tree, ctx->record_id_tree) { |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
518 pws3_record = pws3_file_get_record(ctx->file, entry->uuid); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
519 group_field = pws3_record_get_field(pws3_record, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
520 PWS3_RECORD_FIELD_GROUP); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
521 group = (group_field != NULL) ? |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
522 pws3_field_get_text(group_field) : NULL; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
523 title_field = pws3_record_get_field(pws3_record, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
524 PWS3_RECORD_FIELD_TITLE); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
525 title = (title_field != NULL) ? |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
526 pws3_field_get_text(title_field) : NULL; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
527 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
528 item = xmalloc(sizeof (union list_item)); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
529 item->record.type = ITEM_TYPE_RECORD; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
530 item->record.group = (group != NULL) ? xstrdup(group) : NULL; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
531 item->record.title = (title != NULL) ? xstrdup(title) : NULL; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
532 item->record.id = entry->id; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
533 memcpy(item->record.uuid, entry->uuid, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
534 sizeof (item->record.uuid)); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
535 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
536 list[list_len++] = item; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
537 } |
3
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
538 /* sort records by group and title in order to find unqiue groups */ |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
539 qsort(list, list_len, sizeof (union list_item *), list_item_cmp); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
540 |
3
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
541 /* add groups based on the sorted records */ |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
542 for (i = 0, j = list_len; i < list_len; i++) { |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
543 group = list[i]->record.group; |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
544 if ((group != NULL) && ((prev_group == NULL) || |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
545 (strcmp(prev_group, group) != 0))) { |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
546 item = xmalloc(sizeof (union list_item)); |
3
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
547 item->group.type = ITEM_TYPE_GROUP; |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
548 item->group.group = (group != NULL) ? xstrdup(group) : |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
549 NULL; |
3
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
550 list[j++] = item; |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
551 prev_group = group; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
552 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
553 } |
3
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
554 list_len = j; |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
555 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
556 /* add empty groups to the list */ |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
557 for (empty_group_field = pws3_file_first_empty_group(ctx->file); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
558 empty_group_field != NULL; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
559 empty_group_field = pws3_file_next_empty_group(ctx->file, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
560 empty_group_field)) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
561 group = pws3_field_get_text(empty_group_field); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
562 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
563 item = xmalloc(sizeof (union list_item)); |
3
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
564 item->group.type = ITEM_TYPE_GROUP; |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
565 item->group.group = xstrdup(group); |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
566 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
567 list[list_len++] = item; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
568 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
569 |
3
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
570 /* terminate the list */ |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
571 list[list_len] = NULL; |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
572 list = xrealloc(list, sizeof (union list_item *) * (list_len + 1)); |
1cc98a5677d9
Refactor the creation of the record and group list
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
2
diff
changeset
|
573 |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
574 /* sort the final list by group and title */ |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
575 qsort(list, list_len, sizeof (union list_item *), list_item_cmp); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
576 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
577 return (list); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
578 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
579 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
580 void |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
581 pwfile_destroy_list(union list_item **list) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
582 { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
583 size_t i; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
584 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
585 if (list == NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
586 return; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
587 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
588 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
589 for (i = 0; list[i] != NULL; i++) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
590 if (list[i]->any.type == ITEM_TYPE_RECORD) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
591 free(list[i]->record.title); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
592 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
593 free(list[i]->any.group); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
594 free(list[i]); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
595 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
596 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
597 free(list); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
598 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
599 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
600 static void |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
601 update_record(struct pws3_record *pws3_record, struct record *record) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
602 { |
9
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
603 time_t now; |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
604 struct pws3_field *ctime_field; |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
605 struct pws3_field *mtime_field; |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
606 struct pws3_field *title_field; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
607 struct pws3_field *group_field; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
608 struct pws3_field *username_field; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
609 struct pws3_field *password_field; |
9
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
610 struct pws3_field *password_mtime_field; |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
611 struct pws3_field *notes_field; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
612 struct pws3_field *url_field; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
613 |
9
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
614 now = time(NULL); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
615 |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
616 ctime_field = pws3_record_get_field(pws3_record, |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
617 PWS3_RECORD_FIELD_CREATION_TIME); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
618 if (ctime_field == NULL) { |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
619 ctime_field = pws3_field_create(0, |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
620 PWS3_RECORD_FIELD_CREATION_TIME); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
621 if (ctime_field == NULL) { |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
622 err(1, "pws3_field_create"); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
623 } |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
624 pws3_field_set_time(ctime_field, now); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
625 pws3_record_set_field(pws3_record, ctime_field); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
626 } |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
627 |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
628 mtime_field = pws3_field_create(0, PWS3_RECORD_FIELD_MODIFICATION_TIME); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
629 if (mtime_field == NULL) { |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
630 err(1, "pws3_field_create"); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
631 } |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
632 pws3_field_set_time(mtime_field, now); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
633 pws3_record_set_field(pws3_record, mtime_field); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
634 |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
635 if (record->title != NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
636 title_field = pws3_field_create(0, PWS3_RECORD_FIELD_TITLE); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
637 if (title_field == NULL) { |
9
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
638 err(1, "pws3_field_create"); |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
639 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
640 if (pws3_field_set_text(title_field, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
641 record->title) != 0) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
642 err(1, "pws3_field_set_text"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
643 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
644 pws3_record_set_field(pws3_record, title_field); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
645 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
646 if (record->group != NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
647 group_field = pws3_field_create(0, PWS3_RECORD_FIELD_GROUP); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
648 if (group_field == NULL) { |
9
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
649 err(1, "pws3_field_create"); |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
650 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
651 if (pws3_field_set_text(group_field, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
652 record->group) != 0) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
653 err(1, "pws3_field_set_text"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
654 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
655 pws3_record_set_field(pws3_record, group_field); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
656 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
657 if (record->username != NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
658 username_field = pws3_field_create(0, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
659 PWS3_RECORD_FIELD_USERNAME); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
660 if (username_field == NULL) { |
9
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
661 err(1, "pws3_field_create"); |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
662 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
663 if (pws3_field_set_text(username_field, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
664 record->username) != 0) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
665 err(1, "pws3_field_set_text"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
666 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
667 pws3_record_set_field(pws3_record, username_field); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
668 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
669 if (record->password != NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
670 password_field = pws3_field_create(0, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
671 PWS3_RECORD_FIELD_PASSWORD); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
672 if (password_field == NULL) { |
9
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
673 err(1, "pws3_field_create"); |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
674 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
675 if (pws3_field_set_text(password_field, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
676 record->password) != 0) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
677 err(1, "pws3_field_set_text"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
678 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
679 pws3_record_set_field(pws3_record, password_field); |
9
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
680 |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
681 password_mtime_field = pws3_field_create(0, |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
682 PWS3_RECORD_FIELD_PASSWORD_MODIFICATION_TIME); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
683 if (password_mtime_field == NULL) { |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
684 err(1, "pws3_field_create"); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
685 } |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
686 pws3_field_set_time(password_mtime_field, now); |
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
687 pws3_record_set_field(pws3_record, password_mtime_field); |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
688 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
689 if (record->notes != NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
690 notes_field = pws3_field_create(0, PWS3_RECORD_FIELD_NOTES); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
691 if (notes_field == NULL) { |
9
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
692 err(1, "pws3_field_create"); |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
693 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
694 if (pws3_field_set_text(notes_field, record->notes) != 0) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
695 err(1, "pws3_field_set_text"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
696 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
697 pws3_record_set_field(pws3_record, notes_field); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
698 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
699 if (record->url != NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
700 url_field = pws3_field_create(0, PWS3_RECORD_FIELD_URL); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
701 if (url_field == NULL) { |
9
60c8ab006e55
Update metadata
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
5
diff
changeset
|
702 err(1, "pws3_field_create"); |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
703 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
704 if (pws3_field_set_text(url_field, record->url) != 0) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
705 err(1, "pws3_field_set_text"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
706 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
707 pws3_record_set_field(pws3_record, url_field); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
708 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
709 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
710 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
711 int |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
712 pwfile_create_record(struct pwm_ctx *ctx, struct record *record) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
713 { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
714 struct pws3_record *pws3_record; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
715 const unsigned char *uuid; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
716 struct record_id_entry *entry; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
717 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
718 pws3_record = pws3_record_create(); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
719 if (pws3_record == NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
720 err(1, "pws3_record_create"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
721 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
722 update_record(pws3_record, record); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
723 pws3_file_insert_record(ctx->file, pws3_record); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
724 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
725 uuid = pws3_field_get_uuid(pws3_record_get_field(pws3_record, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
726 PWS3_RECORD_FIELD_UUID)); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
727 entry = xmalloc(sizeof (struct record_id_entry)); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
728 entry->id = ctx->next_id++; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
729 memcpy(entry->uuid, uuid, sizeof (entry->uuid)); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
730 RB_INSERT(record_id_tree, ctx->record_id_tree, entry); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
731 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
732 return (0); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
733 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
734 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
735 int |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
736 pwfile_modify_record(struct pwm_ctx *ctx, unsigned int id, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
737 struct record *record) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
738 { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
739 const unsigned char *uuid; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
740 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
741 uuid = record_id_tree_get_uuid(ctx->record_id_tree, id); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
742 if (uuid == NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
743 return (-1); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
744 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
745 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
746 update_record(pws3_file_get_record(ctx->file, uuid), record); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
747 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
748 return (0); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
749 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
750 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
751 int |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
752 pwfile_remove_record(struct pwm_ctx *ctx, unsigned int id) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
753 { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
754 const unsigned char *uuid; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
755 struct record_id_entry *entry; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
756 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
757 uuid = record_id_tree_get_uuid(ctx->record_id_tree, id); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
758 if (uuid == NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
759 return (-1); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
760 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
761 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
762 pws3_record_destroy(pws3_file_remove_record(ctx->file, uuid)); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
763 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
764 entry = RB_FIND(record_id_tree, ctx->record_id_tree, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
765 &(struct record_id_entry){ .id = id }); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
766 free(RB_REMOVE(record_id_tree, ctx->record_id_tree, entry)); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
767 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
768 return (0); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
769 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
770 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
771 int |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
772 pwfile_create_group(struct pwm_ctx *ctx, const char *group) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
773 { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
774 struct pws3_record *pws3_record; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
775 struct pws3_field *group_field; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
776 struct pws3_field *empty_group_field; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
777 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
778 /* check for a record in the given group */ |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
779 for (pws3_record = pws3_file_first_record(ctx->file); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
780 pws3_record != NULL; pws3_record = pws3_file_next_record(ctx->file, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
781 pws3_record)) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
782 group_field = pws3_record_get_field(pws3_record, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
783 PWS3_RECORD_FIELD_GROUP); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
784 if ((group_field != NULL) && |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
785 (strcmp(group, pws3_field_get_text(group_field)) == 0)) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
786 return (-1); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
787 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
788 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
789 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
790 empty_group_field = pws3_field_create(1, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
791 PWS3_HEADER_FIELD_EMPTY_GROUPS); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
792 if (empty_group_field == NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
793 err(1, "pws3_field_create"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
794 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
795 if (pws3_field_set_text(empty_group_field, group) != 0) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
796 err(1, "pws3_field_set_text"); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
797 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
798 pws3_file_insert_empty_group(ctx->file, empty_group_field); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
799 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
800 return (0); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
801 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
802 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
803 int |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
804 pwfile_remove_group(struct pwm_ctx *ctx, const char *group) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
805 { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
806 struct pws3_field *empty_group_field; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
807 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
808 empty_group_field = pws3_file_remove_empty_group(ctx->file, group); |
4
b5c4267a7182
Fix check for successful deletion of a empty group
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
3
diff
changeset
|
809 if (empty_group_field == NULL) { |
0
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
810 return (-1); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
811 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
812 pws3_field_destroy(empty_group_field); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
813 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
814 return (0); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
815 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
816 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
817 struct record * |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
818 pwfile_get_record(struct pwm_ctx *ctx, unsigned int id) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
819 { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
820 struct record *record; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
821 const unsigned char *uuid; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
822 struct pws3_record *pws3_record; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
823 struct pws3_field *title_field; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
824 struct pws3_field *group_field; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
825 struct pws3_field *username_field; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
826 struct pws3_field *password_field; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
827 struct pws3_field *notes_field; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
828 struct pws3_field *url_field; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
829 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
830 uuid = record_id_tree_get_uuid(ctx->record_id_tree, id); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
831 if (uuid == NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
832 return (NULL); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
833 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
834 pws3_record = pws3_file_get_record(ctx->file, uuid); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
835 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
836 record = xmalloc(sizeof (struct record)); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
837 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
838 title_field = pws3_record_get_field(pws3_record, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
839 PWS3_RECORD_FIELD_TITLE); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
840 record->title = (title_field != NULL) ? |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
841 xstrdup(pws3_field_get_text(title_field)) : NULL; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
842 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
843 group_field = pws3_record_get_field(pws3_record, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
844 PWS3_RECORD_FIELD_GROUP); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
845 record->group = (group_field != NULL) ? |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
846 xstrdup(pws3_field_get_text(group_field)) : NULL; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
847 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
848 username_field = pws3_record_get_field(pws3_record, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
849 PWS3_RECORD_FIELD_USERNAME); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
850 record->username = (username_field != NULL) ? |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
851 xstrdup(pws3_field_get_text(username_field)) : NULL; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
852 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
853 password_field = pws3_record_get_field(pws3_record, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
854 PWS3_RECORD_FIELD_PASSWORD); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
855 record->password = (password_field != NULL) ? |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
856 xstrdup(pws3_field_get_text(password_field)) : NULL; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
857 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
858 notes_field = pws3_record_get_field(pws3_record, |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
859 PWS3_RECORD_FIELD_NOTES); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
860 record->notes = (notes_field != NULL) ? |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
861 xstrdup(pws3_field_get_text(notes_field)) : NULL; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
862 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
863 url_field = pws3_record_get_field(pws3_record, PWS3_RECORD_FIELD_URL); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
864 record->url = (url_field != NULL) ? |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
865 xstrdup(pws3_field_get_text(url_field)) : NULL; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
866 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
867 return (record); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
868 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
869 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
870 void |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
871 pwfile_destroy_record(struct record *record) |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
872 { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
873 if (record == NULL) { |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
874 return; |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
875 } |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
876 |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
877 free(record->title); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
878 free(record->group); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
879 free(record->username); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
880 free(record->password); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
881 free(record->notes); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
882 free(record->url); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
883 free(record); |
a7e41e1a79c8
Initial revision
Guido Berhoerster <guido+pwm@berhoerster.name>
parents:
diff
changeset
|
884 } |