check -mod flag and fix type error

Author: tsingbx

cmd/internal/base/base.go

@@ -121,7 +121,7 @@ func RunCmdWithName(cmd *Command, args []string, name string, out *io.PipeWriter
 		nameCmd.Stdout = out
 	}
 	nameCmd.Stderr = os.Stderr
-	nameCmd.Run()
+	Check(nameCmd.Run())
 }
 
 func Check(err error) {

cmd/internal/gencfg/flags.go

@@ -11,7 +11,7 @@ func addFlags(fs *flag.FlagSet) {
 	fs.BoolVar(&cpp, "cpp", false, "if it is C++ lib")
 	fs.BoolVar(&help, "help", false, "print help message")
 	fs.BoolVar(&tab, "tab", true, "generate .cfg config file with tab indent")
-	fs.StringVar(&excludes, "excludes", "", "exclude all header files in subdir of include expamle -excludes=\"internal impl\"")
+	fs.StringVar(&excludes, "excludes", "", "exclude all header files in subdir of include example -excludes=\"internal impl\"")
 	fs.StringVar(&extsString, "exts", ".h", "extra include file extensions for example -exts=\".h .hpp .hh\"")
 	fs.StringVar(&dependencies, "deps", "", "deps for autofilling dependencies")
 }

cmd/internal/genpkg/genpkg.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/goplus/llcppg/cmd/internal/base"
 	"github.com/goplus/llcppg/config"
+	"golang.org/x/mod/module"
 )
 
 var Cmd = &base.Command{
@@ -27,6 +28,9 @@ func runCmd(cmd *base.Command, args []string) {
 		return
 	}
 
+	err = module.CheckPath(modulePath)
+	base.Check(err)
+
 	cfgFile := config.LLCPPG_CFG
 
 	config.HandleMarshalConfigFile(cfgFile, func(b []byte, err error) {
@@ -35,6 +39,7 @@ func runCmd(cmd *base.Command, args []string) {
 
 		r, w := io.Pipe()
 
+		errCh := make(chan error, 1)
 		go func() {
 			defer w.Close()
 			llcppsigfetchCmdArgs := make([]string, 0)
@@ -48,14 +53,11 @@ func runCmd(cmd *base.Command, args []string) {
 			llcppsigfetchCmd.Stdin = bytes.NewReader(b)
 			llcppsigfetchCmd.Stdout = w
 			llcppsigfetchCmd.Stderr = os.Stderr
-			err = llcppsigfetchCmd.Run()
-			base.Check(err)
+			errCh <- llcppsigfetchCmd.Run()
 		}()
 
 		gogensigCmdArgs := make([]string, 0)
-		if len(modulePath) > 0 {
-			gogensigCmdArgs = append(gogensigCmdArgs, fmt.Sprintf("-mod=%s", modulePath))
-		}
+		gogensigCmdArgs = append(gogensigCmdArgs, fmt.Sprintf("-mod=%s", modulePath))
 		if verbose {
 			gogensigCmdArgs = append(gogensigCmdArgs, "-v")
 		}
@@ -65,5 +67,9 @@ func runCmd(cmd *base.Command, args []string) {
 		gogensigCmd.Stderr = os.Stderr
 		err = gogensigCmd.Run()
 		base.Check(err)
+
+		if fetchErr := <-errCh; fetchErr != nil {
+			base.Check(fetchErr)
+		}
 	})
 }

cmd/llcppgx/main_app.gox

@@ -1,15 +1,15 @@
 short `	
 llcppgx aims to be a tool for automatically generating LLGo bindings for C/C++ libraries.
 
-In order to convert C/C++ library to go package, you should do the steps as folows:
+In order to convert C/C++ library to go package, you should do the steps as follows:
 
 1、llcppgx init <libname>
-For exampe, run 'llcppgx init libcjson', it will init llcppg.cfg for libcjson library.
+For example, run 'llcppgx init libcjson', it will init llcppg.cfg for libcjson library.
 In order to successfully convert the C/C++ library, you should carefully inspect and edit llcppg.cfg.
 
 2、llcppgx gensym
-It will generates and edits the symbol table for the libcjson library.
+It will generate and edits the symbol table for the libcjson library.
 
 3、llcppgx genpkg -mod "github.com/goplus/cjson"
-It will enerates a go package for the libcjson library.
+It will generate a go package for the libcjson library.
 `

config/parse.go

@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"path/filepath"
+	"strings"
 
 	"github.com/goplus/llgo/xtool/env"
 )
@@ -37,7 +39,33 @@ func (c *Config) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
+func isPathWithinCurrentDirectory(targetPath string) (bool, error) {
+	// Get the absolute path of the current working directory
+	cwd, err := os.Getwd()
+	if err != nil {
+		return false, fmt.Errorf("failed to get current working directory: %w", err)
+	}
+
+	// Get the absolute path of the target path
+	absTargetPath, err := filepath.Abs(targetPath)
+	if err != nil {
+		return false, fmt.Errorf("failed to get absolute path for target: %w", err)
+	}
+
+	// Clean both paths for consistent comparison
+	cleanedCwd := filepath.Clean(cwd)
+	cleanedAbsTargetPath := filepath.Clean(absTargetPath)
+
+	// Check if the cleaned absolute target path starts with the cleaned absolute current directory path
+	return strings.HasPrefix(cleanedAbsTargetPath, cleanedCwd), nil
+}
+
 func ParseConfigFile(cfgFile string) (*Config, error) {
+	ok, _ := isPathWithinCurrentDirectory(cfgFile)
+	if !ok {
+		return nil, fmt.Errorf("ParseConfigFile:%s is not within current directory", cfgFile)
+	}
+
 	openCfgFile, err := os.Open(cfgFile)
 	if err != nil {
 		return nil, err

go.mod

@@ -11,4 +11,4 @@ require (
 	github.com/qiniu/x v1.15.1
 )
 
-require golang.org/x/mod v0.27.0 // indirect
+require golang.org/x/mod v0.27.0