From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage-utils:master commit in: libq/
Date: Mon, 25 May 2020 10:43:56 +0000 (UTC) [thread overview]
Message-ID: <1590402515.f6d31778569b3bb53a743515a8993aa64cdf0bfe.grobian@gentoo> (raw)
commit: f6d31778569b3bb53a743515a8993aa64cdf0bfe
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 10:28:35 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon May 25 10:28:35 2020 +0000
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=f6d31778
libq/atom: add atom_clone function
atom_clone() does a deep copy of the given atom, such that it lives
completely on its own and needs its own atom_implode() call.
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
libq/atom.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
libq/atom.h | 1 +
2 files changed, 107 insertions(+)
diff --git a/libq/atom.c b/libq/atom.c
index e79c30a..7e72bf3 100644
--- a/libq/atom.c
+++ b/libq/atom.c
@@ -355,6 +355,112 @@ atom_explode(const char *atom)
return ret;
}
+depend_atom *
+atom_clone(depend_atom *atom)
+{
+ depend_atom *ret;
+ char *p;
+ size_t alen;
+ size_t clen = 0;
+ size_t flen = 0;
+ size_t plen = 0;
+ size_t nlen = 0;
+ size_t slen = 0;
+ size_t rlen = 0;
+
+ if (atom->REPO != NULL)
+ rlen = strlen(atom->REPO) + 1;
+ if (atom->SLOT != NULL)
+ slen = strlen(atom->SLOT) + 1;
+ if (atom->CATEGORY != NULL)
+ clen = strlen(atom->CATEGORY) + 1;
+ if (atom->PF != NULL)
+ flen = strlen(atom->PF) + 1; /* should include PVR */
+ if (atom->P != NULL)
+ plen = strlen(atom->P) + 1; /* should include PV */
+ if (atom->PN != NULL)
+ nlen = strlen(atom->PN) + 1;
+
+ alen = sizeof(*ret) + clen + flen + plen + nlen + rlen + slen;
+ ret = xmalloc(alen);
+ memset(ret, '\0', sizeof(*ret));
+
+ /* build up main storage pointers, see explode */
+ p = (char *)ret + sizeof(*ret);
+ if (atom->CATEGORY != NULL) {
+ ret->CATEGORY = p;
+ memcpy(ret->CATEGORY, atom->CATEGORY, clen);
+ p += clen;
+ }
+ if (atom->PF != NULL) {
+ ret->PF = p;
+ memcpy(ret->PF, atom->PF, flen);
+ p += flen;
+ }
+ if (atom->PVR > atom->PF && atom->PVR < (atom->PF + flen))
+ ret->PVR = ret->PF + (atom->PVR - atom->PF);
+ if (atom->P != NULL) {
+ ret->P = p;
+ memcpy(ret->P, atom->P, plen);
+ p += plen;
+ }
+ if (atom->PV > atom->P && atom->PV < (atom->P + plen))
+ ret->PV = ret->P + (atom->PV - atom->P);
+ if (atom->PN != NULL) {
+ ret->PN = p;
+ memcpy(ret->PN, atom->PN, nlen);
+ p += nlen;
+ }
+ if (atom->SLOT != NULL) {
+ ret->SLOT = p;
+ memcpy(ret->SLOT, atom->SLOT, slen);
+ p += slen;
+ }
+ if (atom->SUBSLOT > atom->SLOT && atom->SUBSLOT < (atom->SLOT + slen))
+ ret->SUBSLOT = ret->SLOT + (atom->SUBSLOT - atom->SLOT);
+ if (atom->REPO != NULL) {
+ ret->REPO = p;
+ memcpy(ret->REPO, atom->REPO, rlen);
+ p += rlen;
+ }
+
+ ret->blocker = atom->blocker;
+ ret->pfx_op = atom->pfx_op;
+ ret->sfx_op = atom->pfx_op;
+ ret->PR_int = atom->PR_int;
+ ret->letter = atom->letter;
+ ret->slotdep = atom->slotdep;
+
+ if (atom->suffixes != NULL) {
+ for (slen = 0; atom->suffixes[slen].suffix != VER_NORM; slen++)
+ ;
+ slen++;
+ ret->suffixes = xmalloc(sizeof(ret->suffixes[0]) * slen);
+ memcpy(ret->suffixes, atom->suffixes, sizeof(ret->suffixes[0]) * slen);
+ }
+
+ if (atom->usedeps) {
+ atom_usedep *w;
+ atom_usedep *n = NULL;
+
+ for (w = atom->usedeps; w != NULL; w = w->next) {
+ nlen = w->use != NULL ? strlen(w->use) + 1 : 0;
+ if (n == NULL) {
+ atom->usedeps = n = xmalloc(sizeof(*n) + nlen);
+ } else {
+ n = n->next = xmalloc(sizeof(*n) + nlen);
+ }
+ n->next = NULL;
+ n->pfx_cond = w->pfx_cond;
+ n->sfx_cond = w->sfx_cond;
+ n->use = (char *)n + sizeof(*n);
+ memcpy(n->use, w->use, nlen);
+ }
+ }
+
+ return ret;
+}
+
void
atom_implode(depend_atom *atom)
{
diff --git a/libq/atom.h b/libq/atom.h
index 1548dd9..aff4548 100644
--- a/libq/atom.h
+++ b/libq/atom.h
@@ -97,6 +97,7 @@ typedef enum {
} atom_equality;
depend_atom *atom_explode(const char *atom);
+depend_atom *atom_clone(depend_atom *atom);
void atom_implode(depend_atom *atom);
atom_equality atom_compare(const depend_atom *a1, const depend_atom *a2);
atom_equality atom_compare_str(const char * const s1, const char * const s2);
next reply other threads:[~2020-05-25 10:44 UTC|newest]
Thread overview: 196+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-25 10:43 Fabian Groffen [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-07-03 19:44 [gentoo-commits] proj/portage-utils:master commit in: libq/ Fabian Groffen
2024-04-08 19:27 Fabian Groffen
2024-02-01 8:21 Fabian Groffen
2024-02-01 8:21 Fabian Groffen
2024-01-31 20:41 Fabian Groffen
2024-01-31 19:30 Fabian Groffen
2024-01-31 19:29 Fabian Groffen
2024-01-27 13:28 Fabian Groffen
2023-04-21 19:11 Fabian Groffen
2023-01-30 14:14 Fabian Groffen
2022-05-26 14:36 Fabian Groffen
2022-05-26 14:36 Fabian Groffen
2022-05-20 17:15 Fabian Groffen
2022-05-20 17:15 Fabian Groffen
2022-05-19 8:32 Fabian Groffen
2022-05-19 8:16 Fabian Groffen
2022-05-19 7:45 Fabian Groffen
2022-02-12 17:13 Fabian Groffen
2022-02-12 17:13 Fabian Groffen
2022-02-06 14:51 Fabian Groffen
2022-02-06 14:29 Fabian Groffen
2022-02-06 13:27 Fabian Groffen
2022-02-06 13:27 Fabian Groffen
2022-02-06 12:22 Fabian Groffen
2021-12-29 12:20 Fabian Groffen
2021-12-26 13:59 Fabian Groffen
2021-12-26 13:59 Fabian Groffen
2021-12-26 13:59 Fabian Groffen
2021-12-26 13:59 Fabian Groffen
2021-12-13 8:39 Fabian Groffen
2021-12-13 8:39 Fabian Groffen
2021-11-13 14:27 Fabian Groffen
2021-10-09 12:13 Fabian Groffen
2021-10-04 6:28 Fabian Groffen
2021-10-04 6:28 Fabian Groffen
2021-10-03 10:49 Fabian Groffen
2021-06-23 7:14 Fabian Groffen
2021-06-14 9:34 Fabian Groffen
2021-06-14 9:34 Fabian Groffen
2021-06-14 9:34 Fabian Groffen
2021-06-14 9:34 Fabian Groffen
2021-06-14 9:34 Fabian Groffen
2021-06-14 9:34 Fabian Groffen
2021-06-01 19:43 Fabian Groffen
2021-05-23 10:54 Fabian Groffen
2021-05-10 9:15 Fabian Groffen
2021-04-29 15:04 Fabian Groffen
2021-04-29 13:47 Fabian Groffen
2021-04-29 13:24 Fabian Groffen
2021-03-13 12:44 Fabian Groffen
2021-02-20 12:06 Fabian Groffen
2021-02-20 11:44 Fabian Groffen
2021-02-17 20:23 Fabian Groffen
2021-02-17 20:23 Fabian Groffen
2021-01-15 20:05 Fabian Groffen
2020-06-27 9:38 Fabian Groffen
2020-06-07 10:41 Fabian Groffen
2020-05-25 18:19 Fabian Groffen
2020-05-25 18:02 Fabian Groffen
2020-05-25 13:26 Fabian Groffen
2020-05-25 11:20 Fabian Groffen
2020-05-25 11:06 Fabian Groffen
2020-05-25 10:43 Fabian Groffen
2020-05-25 10:43 Fabian Groffen
2020-05-25 10:43 Fabian Groffen
2020-05-25 10:43 Fabian Groffen
2020-05-17 12:35 Fabian Groffen
2020-05-17 12:35 Fabian Groffen
2020-02-03 13:17 Fabian Groffen
2020-02-03 13:09 Fabian Groffen
2020-01-26 19:31 Fabian Groffen
2020-01-22 19:54 Fabian Groffen
2020-01-22 19:54 Fabian Groffen
2020-01-20 19:54 Fabian Groffen
2020-01-20 19:34 Fabian Groffen
2020-01-19 19:36 Fabian Groffen
2020-01-19 19:09 Fabian Groffen
2020-01-19 19:09 Fabian Groffen
2020-01-19 19:09 Fabian Groffen
2020-01-19 19:09 Fabian Groffen
2020-01-19 16:37 Fabian Groffen
2020-01-19 12:37 Fabian Groffen
2020-01-19 10:05 Fabian Groffen
2020-01-19 9:49 Fabian Groffen
2020-01-19 9:49 Fabian Groffen
2020-01-17 8:22 Fabian Groffen
2020-01-05 16:08 Fabian Groffen
2020-01-05 16:08 Fabian Groffen
2020-01-05 16:08 Fabian Groffen
2020-01-02 15:09 Fabian Groffen
2020-01-02 14:07 Fabian Groffen
2020-01-02 14:07 Fabian Groffen
2020-01-02 14:07 Fabian Groffen
2020-01-02 11:55 Fabian Groffen
2020-01-02 11:19 Fabian Groffen
2019-12-30 17:24 Fabian Groffen
2019-12-27 21:19 Fabian Groffen
2019-12-27 16:57 Fabian Groffen
2019-12-27 16:57 Fabian Groffen
2019-11-29 13:22 Fabian Groffen
2019-11-20 17:23 Fabian Groffen
2019-11-19 20:28 Fabian Groffen
2019-11-17 15:12 Fabian Groffen
2019-11-17 15:12 Fabian Groffen
2019-11-13 18:19 Fabian Groffen
2019-11-13 15:48 Fabian Groffen
2019-11-13 15:20 Fabian Groffen
2019-11-09 10:29 Fabian Groffen
2019-09-26 14:06 Fabian Groffen
2019-09-26 14:06 Fabian Groffen
2019-09-26 14:06 Fabian Groffen
2019-09-26 14:06 Fabian Groffen
2019-09-26 13:00 Fabian Groffen
2019-09-25 15:05 Fabian Groffen
2019-09-21 19:53 Fabian Groffen
2019-09-21 19:53 Fabian Groffen
2019-07-14 18:51 Fabian Groffen
2019-07-13 15:37 Fabian Groffen
2019-07-13 9:50 Fabian Groffen
2019-07-12 18:04 Fabian Groffen
2019-06-19 7:41 Fabian Groffen
2019-06-10 10:09 Fabian Groffen
2019-06-05 7:57 Fabian Groffen
2019-05-21 14:12 Fabian Groffen
2019-05-14 20:19 Fabian Groffen
2019-05-14 20:19 Fabian Groffen
2019-05-11 11:11 Fabian Groffen
2019-05-11 7:14 Fabian Groffen
2019-05-11 7:14 Fabian Groffen
2019-05-10 15:32 Fabian Groffen
2019-05-10 15:32 Fabian Groffen
2019-05-10 15:32 Fabian Groffen
2019-05-07 6:19 Fabian Groffen
2019-05-06 16:04 Fabian Groffen
2019-05-06 16:04 Fabian Groffen
2019-05-05 20:05 Fabian Groffen
2019-05-05 18:13 Fabian Groffen
2019-05-05 8:58 Fabian Groffen
2019-05-04 11:53 Fabian Groffen
2019-05-03 11:45 Fabian Groffen
2019-05-02 15:17 Fabian Groffen
2019-05-01 19:09 Fabian Groffen
2019-04-30 8:20 Fabian Groffen
2019-04-30 7:54 Fabian Groffen
2019-04-28 17:10 Fabian Groffen
2019-04-28 16:21 Fabian Groffen
2019-04-28 16:02 Fabian Groffen
2019-04-27 8:38 Fabian Groffen
2019-04-25 17:36 Fabian Groffen
2019-04-25 9:22 Fabian Groffen
2019-04-25 9:22 Fabian Groffen
2019-04-25 9:22 Fabian Groffen
2019-04-25 9:22 Fabian Groffen
2019-04-19 11:47 Fabian Groffen
2019-03-27 10:55 Fabian Groffen
2019-03-11 20:55 Fabian Groffen
2019-03-09 18:58 Fabian Groffen
2019-02-27 20:53 Fabian Groffen
2019-02-27 20:53 Fabian Groffen
2019-02-05 14:19 Fabian Groffen
2018-12-20 20:02 Fabian Groffen
2018-12-20 20:02 Fabian Groffen
2018-12-20 18:24 Fabian Groffen
2018-04-09 7:15 Fabian Groffen
2018-04-05 13:31 Fabian Groffen
2018-04-05 12:46 Fabian Groffen
2018-04-03 20:00 Fabian Groffen
2018-03-26 18:41 Fabian Groffen
2018-03-25 14:13 Fabian Groffen
2018-03-25 14:00 Fabian Groffen
2018-03-23 20:17 Fabian Groffen
2018-03-23 11:56 Fabian Groffen
2018-03-23 11:29 Fabian Groffen
2017-12-29 11:45 Fabian Groffen
2017-12-29 11:45 Fabian Groffen
2017-12-29 11:45 Fabian Groffen
2016-12-29 2:25 Mike Frysinger
2016-11-12 17:23 Mike Frysinger
2016-02-14 1:26 Mike Frysinger
2016-02-14 1:26 Mike Frysinger
2015-11-26 8:43 Mike Frysinger
2015-10-15 22:00 Mike Frysinger
2015-10-15 22:00 Mike Frysinger
2015-05-31 8:31 Mike Frysinger
2015-05-19 17:37 Mike Frysinger
2015-02-24 1:26 Mike Frysinger
2015-02-24 1:26 Mike Frysinger
2015-02-24 1:26 Mike Frysinger
2015-02-21 18:06 Mike Frysinger
2015-02-16 11:47 Mike Frysinger
2014-03-11 4:53 Mike Frysinger
2014-03-08 5:51 Mike Frysinger
2014-03-08 5:51 Mike Frysinger
2014-03-08 5:51 Mike Frysinger
2014-03-08 5:51 Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1590402515.f6d31778569b3bb53a743515a8993aa64cdf0bfe.grobian@gentoo \
--to=grobian@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox