libpod: return full path in sqliteStatePath()

It makes more sense for the callers.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>

<MH: Fix cherry-pick conflicts>

Signed-off-by: Matthew Heon <matthew.heon@pm.me>

Author: Luap99

libpod/sqlite_state.go

@@ -46,7 +46,7 @@ const (
 	sqliteOptionCaseSensitiveLike = "&_cslike=TRUE"
 
 	// Assembled sqlite options used when opening the database.
-	sqliteOptions = sqliteDbFilename + "?" +
+	sqliteOptions = "?" +
 		sqliteOptionLocation +
 		sqliteOptionSynchronous +
 		sqliteOptionForeignKeys +
@@ -59,12 +59,12 @@ func NewSqliteState(runtime *Runtime) (_ State, defErr error) {
 	logrus.Info("Using sqlite as database backend")
 	state := new(SQLiteState)
 
-	basePath, _ := sqliteStatePath(runtime)
+	dbPath := sqliteStatePath(runtime)
 
 	// c/storage is set up *after* the DB - so even though we use the c/s
 	// root (or, for transient, runroot) dir, we need to make the dir
 	// ourselves.
-	if err := os.MkdirAll(basePath, 0o700); err != nil {
+	if err := os.MkdirAll(filepath.Dir(dbPath), 0o700); err != nil {
 		return nil, fmt.Errorf("creating root directory: %w", err)
 	}
 
@@ -79,7 +79,7 @@ func NewSqliteState(runtime *Runtime) (_ State, defErr error) {
 	}
 	sqliteOptionBusyTimeout := "&_busy_timeout=" + busyTimeout
 
-	conn, err := sql.Open("sqlite3", filepath.Join(basePath, sqliteOptions+sqliteOptionBusyTimeout))
+	conn, err := sql.Open("sqlite3", dbPath+sqliteOptions+sqliteOptionBusyTimeout)
 	if err != nil {
 		return nil, fmt.Errorf("initializing sqlite database: %w", err)
 	}

libpod/sqlite_state_internal.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"path/filepath"
 	"slices"
 	"sort"
 	"strings"
@@ -19,16 +20,15 @@ import (
 	_ "github.com/mattn/go-sqlite3"
 )
 
-// Returns two strings. First is base path - directory we'll create in.
-// Second is the filename of the database itself.
-func sqliteStatePath(runtime *Runtime) (string, string) {
+// sqliteStatePath returns the path to the sqlite file.
+func sqliteStatePath(runtime *Runtime) string {
 	basePath := runtime.storageConfig.GraphRoot
 	if runtime.storageConfig.TransientStore {
 		basePath = runtime.storageConfig.RunRoot
 	} else if !runtime.storageSet.StaticDirSet {
 		basePath = runtime.config.Engine.StaticDir
 	}
-	return basePath, sqliteDbFilename
+	return filepath.Join(basePath, sqliteDbFilename)
 }
 
 func initSQLiteDB(conn *sql.DB) (defErr error) {