GitHubMirror/libmutton
1
0
Fork 0
mirror of https://github.com/rwinkhart/libmutton.git synced 2026-08-30 22:06:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use nil pointer to indicate missing device ID (rather than FSMisc)

Browse Source
This commit is contained in:
RandyTheSilly
2026-01-21 18:49:16 -05:00
parent 48e084ac0f
commit 409db78d83
5 changed files with 48 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
global/init.go
+9 -10
View File
@@ -9,36 +9,35 @@ import (
// DirInit creates the libmutton directories.
// Returns: oldDeviceID (from before the directory reset; will be FSMisc if there is no pre-existing ID).
func DirInit(preserveOldCfgDir bool) (string, error) {
func DirInit(preserveOldCfgDir bool) (*string, error) {
var err error
// create EntryRoot
if err := os.MkdirAll(EntryRoot, 0700); err != nil {
return "", errors.New("unable to create \"" + EntryRoot + "\": " + err.Error())
if err = os.MkdirAll(EntryRoot, 0700); err != nil {
return nil, errors.New("unable to create \"" + EntryRoot + "\": " + err.Error())
}
// get old device ID before its potential removal
oldDeviceID, err := GetCurrentDeviceID()
if err != nil {
oldDeviceID = FSMisc
}
oldDeviceID, _ := GetCurrentDeviceID() // error ignored; oldDeviceID is set to nil on error, which is the correct assumption
// remove existing config directory (if it exists and not in append mode)
if !preserveOldCfgDir {
isAccessible, _ := back.TargetIsFile(CfgDir, false) // error is ignored because dir/file status is irrelevant
if isAccessible {
if err = os.RemoveAll(CfgDir); err != nil {
return "", errors.New("unable to remove existing config directory: " + err.Error())
return nil, errors.New("unable to remove existing config directory: " + err.Error())
}
}
}
// create config directory w/devices subdirectory
if err = os.MkdirAll(CfgDir+PathSeparator+"devices", 0700); err != nil {
return "", errors.New("unable to create \"" + CfgDir + "\": " + err.Error())
return nil, errors.New("unable to create \"" + CfgDir + "\": " + err.Error())
}
// create password age directory
if err = os.MkdirAll(AgeDir, 0700); err != nil {
return "", errors.New("unable to create \"" + AgeDir + "\": " + err.Error())
return nil, errors.New("unable to create \"" + AgeDir + "\": " + err.Error())
}
return oldDeviceID, nil