работа с буфером и сохранение данных из сети в буфер

lab03.depend

@@ -54,12 +54,14 @@
 	<iostream>
 	<vector>
 
-1748112464 source:c:\users\koldinad\desktop\lab34\main.cpp
+1748126700 source:c:\users\koldinad\desktop\lab34\main.cpp
 	<iostream>
 	<vector>
 	"histogram.h"
 	"text.h"
 	"svg.h"
+	<sstream>
+	<string>
 	<curl/curl.h>
 
 1748110813 c:\users\koldinad\desktop\lab34\curl\include\curl\curl.h

main.cpp

@@ -3,6 +3,10 @@
 #include "histogram.h"
 #include "text.h"
 #include "svg.h"
+#include <sstream>
+#include <string>
+#include <curl/curl.h>
+
 using namespace std;
 
 struct Input{
@@ -28,34 +32,49 @@ input_data(istream& in, bool prompt=false)
     return inn;
 }
 
-size_t write_data(void* ptr, size_t size, size_t nmemb, void* stream){
+size_t write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
-    size_t written = fwrite(ptr, size, nmemb, stdout);
+    size_t data_size = item_size * item_count;
-    return written;
+    stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
+    buffer->write(reinterpret_cast<const char*>(items), data_size);
+    return data_size;
 }
 
-#include <curl/curl.h>
+Input download(const string& address) {
-int main(int argc, char* argv[])
+    stringstream buffer;
-{
-    if (argc > 1) {
     CURL* curl = curl_easy_init();
     if (curl) {
-            curl_easy_setopt(curl, CURLOPT_URL, argv[1]);
+        curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
+
         curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
+        curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
 
         CURLcode res = curl_easy_perform(curl);
         if (res != CURLE_OK) {
             cerr << "cURL error: " << curl_easy_strerror(res) << endl;
+            curl_easy_cleanup(curl);
+            exit(1);
+        }
+        curl_easy_cleanup(curl);
+    }
+    else {
+        cerr << "curl_easy_init() failed" << endl;
+        exit(1);
+    }
+    return input_data(buffer, false);
 }
 
-            curl_easy_cleanup(curl);
+int main(int argc, char* argv[])
-        } else {
+{
-            cerr << "curl_easy_init() failed" << endl;
+    Input inn;
+    if (argc > 1) {
+        inn = download(argv[1]);
     }
+    else {
+        inn = input_data(cin, true);
+    }
+
+    const auto bins = make_histogram(inn.numbers, inn.bin_count);
+    show_histogram_svg(bins);
+
     return 0;
 }
-    curl_global_init(CURL_GLOBAL_ALL);
-    size_t max_count;
-    auto inn = input_data(cin, true);
-    auto bins = make_histogram(inn.numbers, inn.bin_count);
-    show_histogram_svg(bins);
-}