Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5d09762 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes Idcbe2046,I09616402,Ide2f1ed9 

* changes:
  Fix sbox in chdir mode
  Check RuleBuilder temporaries for path errors
  Fix WriteFileRule escaping
parents 0e3758ca c590ec4b

android/defs.go

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ var ( 


func buildWriteFileRule(ctx BuilderContext, outputFile WritablePath, content string) {

	content = echoEscaper.Replace(content)

	content = proptools.ShellEscape(content)

	content = proptools.NinjaEscape(proptools.ShellEscapeIncludingSpaces(content))

	if content == "" {

		content = "''"

	}

android/rule_builder.go

+7 −1
Original line number Diff line number Diff line
@@ -523,6 +523,12 @@ func (r *RuleBuilder) Build(name string, desc string) { 
			})

		}



		// Outputs that were marked Temporary will not be checked that they are in the output

		// directory by the loop above, check them here.

		for path := range r.temporariesSet {

			Rel(r.ctx, r.outDir.String(), path.String())

		}



		// Add a hash of the list of input files to the manifest so that the textproto file

		// changes when the list of input files changes and causes the sbox rule that

		// depends on it to rerun.
@@ -537,7 +543,7 @@ func (r *RuleBuilder) Build(name string, desc string) { 
		}



		// Create a rule to write the manifest as a the textproto.

		WriteFileRule(r.ctx, r.sboxManifestPath, proptools.NinjaEscape(proto.MarshalTextString(&manifest)))

		WriteFileRule(r.ctx, r.sboxManifestPath, proto.MarshalTextString(&manifest))



		// Generate a new string to use as the command line of the sbox rule.  This uses

		// a RuleBuilderCommand as a convenience method of building the command line, then

cmd/sbox/sbox.go

+30 −2
Original line number Diff line number Diff line
@@ -229,13 +229,18 @@ func runCommand(command *sbox_proto.Command, tempDir string) (depFile string, er 
		return "", err

	}



	pathToTempDirInSbox := tempDir

	if command.GetChdir() {

		pathToTempDirInSbox = "."

	}



	if strings.Contains(rawCommand, depFilePlaceholder) {

		depFile = filepath.Join(tempDir, "deps.d")

		depFile = filepath.Join(pathToTempDirInSbox, "deps.d")

		rawCommand = strings.Replace(rawCommand, depFilePlaceholder, depFile, -1)

	}



	if strings.Contains(rawCommand, sandboxDirPlaceholder) {

		rawCommand = strings.Replace(rawCommand, sandboxDirPlaceholder, tempDir, -1)

		rawCommand = strings.Replace(rawCommand, sandboxDirPlaceholder, pathToTempDirInSbox, -1)

	}



	// Emulate ninja's behavior of creating the directories for any output files before
@@ -254,6 +259,15 @@ func runCommand(command *sbox_proto.Command, tempDir string) (depFile string, er 


	if command.GetChdir() {

		cmd.Dir = tempDir

		path := os.Getenv("PATH")

		absPath, err := makeAbsPathEnv(path)

		if err != nil {

			return "", err

		}

		err = os.Setenv("PATH", absPath)

		if err != nil {

			return "", fmt.Errorf("Failed to update PATH: %w", err)

		}

	}

	err = cmd.Run()
@@ -466,3 +480,17 @@ func joinPath(dir, file string) string { 
	}

	return filepath.Join(dir, file)

}



func makeAbsPathEnv(pathEnv string) (string, error) {

	pathEnvElements := filepath.SplitList(pathEnv)

	for i, p := range pathEnvElements {

		if !filepath.IsAbs(p) {

			absPath, err := filepath.Abs(p)

			if err != nil {

				return "", fmt.Errorf("failed to make PATH entry %q absolute: %w", p, err)

			}

			pathEnvElements[i] = absPath

		}

	}

	return strings.Join(pathEnvElements, string(filepath.ListSeparator)), nil

}