From b136e35b314372c2f1ae32de1cd037ed3b98500f Mon Sep 17 00:00:00 2001 From: Wvader <34067397+wvader@users.noreply.github.com> Date: Wed, 2 Nov 2022 17:12:19 +0000 Subject: [PATCH] Remove test code --- main.cpp | 46 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/main.cpp b/main.cpp index 9122b33..7c5711b 100644 --- a/main.cpp +++ b/main.cpp @@ -20,11 +20,9 @@ static void testGet() { struct augeas *aug; char *s; - aug = aug_init(root, loadpath, AUG_NO_STDINC|AUG_NO_LOAD); + aug = aug_init(root, loadpath, AUG_NO_STDINC | AUG_NO_LOAD); r = aug_load_file(aug, "/etc/hosts"); - - r = aug_source(aug, "/files/etc/hosts/1", &s); std::cout << "The value read from node: " << s << std::endl; @@ -32,7 +30,7 @@ static void testGet() { aug_close(aug); } -static void testAugPreview() { +static void readHostsFile() { struct augeas *aug; int r; char *s; @@ -42,20 +40,41 @@ static void testAugPreview() { int readsz = 0; /* Read the original contents of the etc/hosts file */ - if (asprintf(&etc_hosts_fn,"%s/etc/hosts",root) >=0 ) { - hosts_fp = fopen(etc_hosts_fn,"r"); - if ( hosts_fp ) { + if (asprintf(&etc_hosts_fn, "%s/etc/hosts", root) >= 0) { + hosts_fp = fopen(etc_hosts_fn, "r"); + if (hosts_fp) { hosts_txt = static_cast(calloc(sizeof(char), 4096)); - if ( hosts_txt ) { - readsz = fread(hosts_txt,sizeof(char),4096,hosts_fp); - *(hosts_txt+readsz) = '\0'; + if (hosts_txt) { + readsz = fread(hosts_txt, sizeof(char), 4096, hosts_fp); + *(hosts_txt + readsz) = '\0'; } fclose(hosts_fp); } free(etc_hosts_fn); } - aug = aug_init(root, loadpath, AUG_NO_STDINC|AUG_NO_LOAD); + aug = aug_init(root, loadpath, AUG_NO_STDINC | AUG_NO_LOAD); + + r = aug_load_file(aug, "/etc/hosts"); + r = aug_preview(aug, "/files/etc/hosts/1", &s); + + std::cout << s << std::endl; + + free(hosts_txt); + free(s); + aug_close(aug); +} + +static void readHostsTree() { + struct augeas *aug; + int r; + char *s; + char *etc_hosts_fn = NULL; + FILE *hosts_fp = NULL; + char *hosts_txt = NULL; + int readsz = 0; + + aug = aug_init(root, loadpath, AUG_NO_STDINC | AUG_NO_LOAD); r = aug_load_file(aug, "/etc/hosts"); r = aug_preview(aug, "/files/etc/hosts/1", &s); @@ -68,10 +87,9 @@ static void testAugPreview() { } - int main(int argc, char *argv[]) { -testGet(); -testAugPreview(); + testGet(); + readHostsFile(); return 0; } \ No newline at end of file