more defaults

Author: revk

sqledit.c

@@ -122,6 +122,9 @@ int main(int argc, const char *argv[])
       return -1;
    }
 
+   if (!sqlconf)
+      sqlconf = getenv("SQL_CNF_FILE");
+
    sql_real_connect(&sql, sqlhost, sqluser, sqlpass, sqldatabase, 0, NULL, 0, 1, sqlconf);
 
    typedef struct fdef_s fdef_t;
@@ -230,7 +233,7 @@ int main(int argc, const char *argv[])
 
    if (cmdlist)
    {                            // List entries in a table
-      sql_s_t s = {0};
+      sql_s_t s = { 0 };
       sql_sprintf(&s, "SELECT * FROM `%s`", sqltable);
       if (sqllimit)
          sql_sprintf(&s, " LIMIT %d", sqllimit);
@@ -308,7 +311,7 @@ int main(int argc, const char *argv[])
 
    if (cmdedit || cmdnew || cmdview)
    {                            // form for editing
-      sql_s_t s = {0};
+      sql_s_t s = { 0 };
       sql_sprintf(&s, "SELECT * FROM `%s` LIMIT 1", sqltable);  // just to get fields
       res = sql_safe_query_use_s(&sql, &s);
       int f,
@@ -497,7 +500,7 @@ int main(int argc, const char *argv[])
 
    if (cmdsave && allowerase && getenv("__ERASE__"))
    {
-      sql_s_t s = {0};
+      sql_s_t s = { 0 };
       sql_sprintf(&s, "SELECT * FROM `%s` LIMIT 1", sqltable);  // just to get fields
       res = sql_safe_query_use_s(&sql, &s);
       int f,
@@ -521,7 +524,7 @@ int main(int argc, const char *argv[])
          sql_safe_query_s(&sql, &s);
    } else if (cmdsave)
    {                            // Save values
-      sql_s_t s = {0};
+      sql_s_t s = { 0 };
       sql_sprintf(&s, "SELECT * FROM `%s` LIMIT 1", sqltable);  // just to get fields
       res = sql_safe_query_use_s(&sql, &s);
       int f,

sqlwrite.c

@@ -148,6 +148,9 @@ int main(int argc, const char *argv[])
          unsetenv(values[n]);   // using default even if exists, so not taken from environment
    }
 
+        if (!sqlconf)
+        sqlconf = getenv("SQL_CNF_FILE");
+
    // connect to database
    sql_real_connect(&sql, sqlhost, sqluser, sqlpass, sqldatabase, sqlport, NULL, 0, 1, sqlconf);
    sql_transaction(&sql);