faux.ini: faux_ini_write_str()

faux/ini.h

@@ -32,6 +32,7 @@ const faux_pair_t *faux_ini_each(faux_ini_node_t **iter);
 
 bool_t faux_ini_parse_str(faux_ini_t *ini, const char *str);
 bool_t faux_ini_parse_file(faux_ini_t *ini, const char *fn);
+char *faux_ini_write_str(const faux_ini_t *ini);
 bool_t faux_ini_write_file(const faux_ini_t *ini, const char *fn);
 
 C_DECL_END

faux/ini/ini.c

@@ -401,32 +401,24 @@ bool_t faux_ini_parse_file(faux_ini_t *ini, const char *fn)
 }
 
 
-/** Writes INI file using INI object.
+/** Writes INI content to string.
  *
- * Write pairs 'name/value' to INI file. The source of pairs is an INI object.
- * It's complementary operation to faux_ini_parse_file().
+ * Write pairs 'name/value' to string. The source of pairs is an INI object.
+ * It's complementary operation to faux_ini_parse_str().
  *
  * @param [in] ini Allocated and initialized INI object.
- * @param [in] fn File name to write to.
- * @return BOOL_TRUE - success, BOOL_FALSE - error
+ * @return Allocated string with INI content or NULL on error.
  */
-bool_t faux_ini_write_file(const faux_ini_t *ini, const char *fn)
+char *faux_ini_write_str(const faux_ini_t *ini)
 {
-	faux_file_t *f = NULL;
 	faux_ini_node_t *iter = NULL;
 	const faux_pair_t *pair = NULL;
 	const char *spaces = " \t"; // String with spaces needs quotes
+	char *str = NULL;
 
 	assert(ini);
-	assert(fn);
 	if (!ini)
-		return BOOL_FALSE;
-	if (!fn || '\0' == *fn)
-		return BOOL_FALSE;
-
-	f = faux_file_open(fn, O_WRONLY | O_CREAT | O_TRUNC, 0644);
-	if (!f)
-		return BOOL_FALSE;
+		return NULL;
 
 	iter = faux_ini_iter(ini);
 	while ((pair = faux_ini_each(&iter))) {
@@ -435,7 +427,6 @@ bool_t faux_ini_write_file(const faux_ini_t *ini, const char *fn)
 		const char *name = faux_pair_name(pair);
 		const char *value = faux_pair_value(pair);
 		char *line = NULL;
-		ssize_t bytes_written = 0;
 
 		// Word with spaces needs quotes
 		quote_name = faux_str_chars(name, spaces) ? "\"" : "";
@@ -446,20 +437,59 @@ bool_t faux_ini_write_file(const faux_ini_t *ini, const char *fn)
 			quote_name, name, quote_name,
 			quote_value, value, quote_value);
 		if (!line) {
-			faux_file_close(f);
-			return BOOL_FALSE;
+			faux_str_free(str);
+			return NULL;
 		}
 
-		// Write to file
-		bytes_written = faux_file_write(f, line, strlen(line));
-		faux_str_free(line);
-		if (bytes_written < 0) { // Can't write to file
-			faux_file_close(f);
-			return BOOL_FALSE;
+		// Add to string
+		if (!faux_str_cat(&str, line)) {
+			faux_str_free(line);
+			faux_str_free(str);
+			return NULL;
 		}
+		faux_str_free(line);
 	}
 
+	return str;
+}
+
+
+/** Writes INI file using INI object.
+ *
+ * Write pairs 'name/value' to INI file. The source of pairs is an INI object.
+ * It's complementary operation to faux_ini_parse_file().
+ *
+ * @param [in] ini Allocated and initialized INI object.
+ * @param [in] fn File name to write to.
+ * @return BOOL_TRUE - success, BOOL_FALSE - error
+ */
+bool_t faux_ini_write_file(const faux_ini_t *ini, const char *fn)
+{
+	faux_file_t *f = NULL;
+	char *str = NULL;
+	ssize_t bytes_written = 0;
+
+	assert(ini);
+	assert(fn);
+	if (!ini)
+		return BOOL_FALSE;
+	if (faux_str_is_empty(fn))
+		return BOOL_FALSE;
+
+	str = faux_ini_write_str(ini);
+	if (!str)
+		return BOOL_FALSE;
+
+	f = faux_file_open(fn, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+	if (!f)
+		return BOOL_FALSE;
+
+	// Write to file
+	bytes_written = faux_file_write_block(f, str, strlen(str));
 	faux_file_close(f);
+	faux_str_free(str);
+	if (bytes_written < 0)  // Can't write to file
+		return BOOL_FALSE;
 
 	return BOOL_TRUE;
 }