diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index f57588c85a..cdc03a3169 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -12,6 +12,7 @@ - Michael Bauer - Vanessa Sochat - Yannick Cote + - Eduardo Arango #Contributors: @@ -22,7 +23,6 @@ - Brian Bockelman - Chris Hollowell - Dave Love - - Eduardo Arango - Felix Abecassis - George Hartzell - Jarrod Johnson @@ -42,4 +42,3 @@ - Thomas Hamel - David Trudgian - Tarcisio Fedrizzi - diff --git a/COPYRIGHT.md b/COPYRIGHT.md index 9f576650cd..84760915ab 100644 --- a/COPYRIGHT.md +++ b/COPYRIGHT.md @@ -1,4 +1,4 @@ -Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. diff --git a/bin/run-singularity b/bin/run-singularity index 77261591da..17f747b9f3 100644 --- a/bin/run-singularity +++ b/bin/run-singularity @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. # diff --git a/bin/singularity.in b/bin/singularity.in index ce31ab2dab..9d8e6df4f8 100644 --- a/bin/singularity.in +++ b/bin/singularity.in @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. # diff --git a/etc/bash_completion.d/singularity b/etc/bash_completion.d/singularity index 0c42e784bc..7dd6053933 100644 --- a/etc/bash_completion.d/singularity +++ b/etc/bash_completion.d/singularity @@ -1,6 +1,6 @@ #!/bin/bash ## Only here for syntax highlighting # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. # diff --git a/etc/configure_transform.py b/etc/configure_transform.py index 2d28114f1a..ef48d3a9a9 100755 --- a/etc/configure_transform.py +++ b/etc/configure_transform.py @@ -1,7 +1,7 @@ #!/usr/bin/env python ''' -Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. Copyright (c) 2017, Vanessa Sochat All rights reserved. diff --git a/examples/arch/Singularity b/examples/arch/Singularity index 80416e14b6..05cd6d9b6c 100644 --- a/examples/arch/Singularity +++ b/examples/arch/Singularity @@ -1,7 +1,7 @@ # Copyright (c) 2015-2016, Maciej Sieczka, Gregory M. Kurtzer. All rights # reserved. # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. # diff --git a/libexec/bootstrap-scripts/checks.sh b/libexec/bootstrap-scripts/checks.sh index e9f45893bf..b49693c0b3 100644 --- a/libexec/bootstrap-scripts/checks.sh +++ b/libexec/bootstrap-scripts/checks.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2017, Vanessa Sochat. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at diff --git a/libexec/bootstrap-scripts/deffile-driver-arch.sh b/libexec/bootstrap-scripts/deffile-driver-arch.sh index dcd0f0299c..67383a72f2 100644 --- a/libexec/bootstrap-scripts/deffile-driver-arch.sh +++ b/libexec/bootstrap-scripts/deffile-driver-arch.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2016, Maciej Sieczka. All rights reserved # # See the COPYRIGHT.md file at the top-level directory of this distribution and at diff --git a/libexec/bootstrap-scripts/deffile-driver-busybox.sh b/libexec/bootstrap-scripts/deffile-driver-busybox.sh index 692af955a2..0f26be969e 100644 --- a/libexec/bootstrap-scripts/deffile-driver-busybox.sh +++ b/libexec/bootstrap-scripts/deffile-driver-busybox.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/bootstrap-scripts/deffile-driver-debootstrap.sh b/libexec/bootstrap-scripts/deffile-driver-debootstrap.sh index 26700466da..5d43b5cd90 100644 --- a/libexec/bootstrap-scripts/deffile-driver-debootstrap.sh +++ b/libexec/bootstrap-scripts/deffile-driver-debootstrap.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/bootstrap-scripts/deffile-driver-docker.sh b/libexec/bootstrap-scripts/deffile-driver-docker.sh index c4e879d0b3..5b4f5b61e4 100644 --- a/libexec/bootstrap-scripts/deffile-driver-docker.sh +++ b/libexec/bootstrap-scripts/deffile-driver-docker.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2017, Vanessa Sochat. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at diff --git a/libexec/bootstrap-scripts/deffile-driver-localimage.sh b/libexec/bootstrap-scripts/deffile-driver-localimage.sh index ad6d0f075e..3a16ae4bad 100644 --- a/libexec/bootstrap-scripts/deffile-driver-localimage.sh +++ b/libexec/bootstrap-scripts/deffile-driver-localimage.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/bootstrap-scripts/deffile-driver-self.sh b/libexec/bootstrap-scripts/deffile-driver-self.sh index c55524ce29..8a062ab730 100644 --- a/libexec/bootstrap-scripts/deffile-driver-self.sh +++ b/libexec/bootstrap-scripts/deffile-driver-self.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2017, Vanessa Sochat. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at diff --git a/libexec/bootstrap-scripts/deffile-driver-shub.sh b/libexec/bootstrap-scripts/deffile-driver-shub.sh index c728e13119..ae5c9a8a20 100644 --- a/libexec/bootstrap-scripts/deffile-driver-shub.sh +++ b/libexec/bootstrap-scripts/deffile-driver-shub.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/bootstrap-scripts/deffile-driver-yum.sh b/libexec/bootstrap-scripts/deffile-driver-yum.sh index 75dae3b17a..c8321b0745 100644 --- a/libexec/bootstrap-scripts/deffile-driver-yum.sh +++ b/libexec/bootstrap-scripts/deffile-driver-yum.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/bootstrap-scripts/deffile-driver-zypper.sh b/libexec/bootstrap-scripts/deffile-driver-zypper.sh index 966440d730..4ede4dd039 100644 --- a/libexec/bootstrap-scripts/deffile-driver-zypper.sh +++ b/libexec/bootstrap-scripts/deffile-driver-zypper.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/bootstrap-scripts/deffile-post.sh b/libexec/bootstrap-scripts/deffile-post.sh index 9673579194..2035c76647 100644 --- a/libexec/bootstrap-scripts/deffile-post.sh +++ b/libexec/bootstrap-scripts/deffile-post.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/bootstrap-scripts/deffile-sections.sh b/libexec/bootstrap-scripts/deffile-sections.sh index 4e3caa7ae6..bbed875ea7 100644 --- a/libexec/bootstrap-scripts/deffile-sections.sh +++ b/libexec/bootstrap-scripts/deffile-sections.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/bootstrap-scripts/environment.sh b/libexec/bootstrap-scripts/environment.sh index 0702f01099..f841eb771f 100644 --- a/libexec/bootstrap-scripts/environment.sh +++ b/libexec/bootstrap-scripts/environment.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/bootstrap-scripts/environment/01-base.sh b/libexec/bootstrap-scripts/environment/01-base.sh index d4a8e9140e..4b99e8d140 100644 --- a/libexec/bootstrap-scripts/environment/01-base.sh +++ b/libexec/bootstrap-scripts/environment/01-base.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. # diff --git a/libexec/bootstrap-scripts/environment/95-apps.sh b/libexec/bootstrap-scripts/environment/95-apps.sh index d20b119f08..b70efc4af4 100644 --- a/libexec/bootstrap-scripts/environment/95-apps.sh +++ b/libexec/bootstrap-scripts/environment/95-apps.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/bootstrap-scripts/environment/99-base.sh b/libexec/bootstrap-scripts/environment/99-base.sh index b75dc78894..dec93ac4f2 100644 --- a/libexec/bootstrap-scripts/environment/99-base.sh +++ b/libexec/bootstrap-scripts/environment/99-base.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. # diff --git a/libexec/bootstrap-scripts/functions b/libexec/bootstrap-scripts/functions index 9da77416f5..cf7b1bd31b 100644 --- a/libexec/bootstrap-scripts/functions +++ b/libexec/bootstrap-scripts/functions @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2017, Vanessa Sochat. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at diff --git a/libexec/bootstrap-scripts/main-deffile-stage1.sh b/libexec/bootstrap-scripts/main-deffile-stage1.sh index 995982520f..4ed8559440 100644 --- a/libexec/bootstrap-scripts/main-deffile-stage1.sh +++ b/libexec/bootstrap-scripts/main-deffile-stage1.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/bootstrap-scripts/main-deffile-stage2.sh b/libexec/bootstrap-scripts/main-deffile-stage2.sh index 616ad40303..bfcd2636f5 100644 --- a/libexec/bootstrap-scripts/main-deffile-stage2.sh +++ b/libexec/bootstrap-scripts/main-deffile-stage2.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/bootstrap-scripts/main-dockerhub.sh b/libexec/bootstrap-scripts/main-dockerhub.sh index 515c6ff0b7..17e95672a5 100644 --- a/libexec/bootstrap-scripts/main-dockerhub.sh +++ b/libexec/bootstrap-scripts/main-dockerhub.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/bootstrap-scripts/main-null.sh b/libexec/bootstrap-scripts/main-null.sh index 249531f078..6719680d84 100644 --- a/libexec/bootstrap-scripts/main-null.sh +++ b/libexec/bootstrap-scripts/main-null.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/bootstrap-scripts/post.sh b/libexec/bootstrap-scripts/post.sh index 2eba5fce70..cf2b9637cd 100644 --- a/libexec/bootstrap-scripts/post.sh +++ b/libexec/bootstrap-scripts/post.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/bootstrap-scripts/pre.sh b/libexec/bootstrap-scripts/pre.sh index 3c49c57a8f..0eb29c5f3d 100644 --- a/libexec/bootstrap-scripts/pre.sh +++ b/libexec/bootstrap-scripts/pre.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/bootstrap-scripts/secbuild.sh b/libexec/bootstrap-scripts/secbuild.sh index 23c9eda47c..631f0d42e3 100755 --- a/libexec/bootstrap-scripts/secbuild.sh +++ b/libexec/bootstrap-scripts/secbuild.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/cli/action_argparser.sh b/libexec/cli/action_argparser.sh index b633341c1a..06bde4e42f 100644 --- a/libexec/cli/action_argparser.sh +++ b/libexec/cli/action_argparser.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/cli/apps.exec b/libexec/cli/apps.exec index 089abd3084..631423eb48 100644 --- a/libexec/cli/apps.exec +++ b/libexec/cli/apps.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2017, Vanessa Sochat. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at diff --git a/libexec/cli/bootstrap.exec b/libexec/cli/bootstrap.exec index c8594c484c..892fe50f6f 100644 --- a/libexec/cli/bootstrap.exec +++ b/libexec/cli/bootstrap.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/cli/build.exec b/libexec/cli/build.exec index 985e6929eb..59ab16c86e 100644 --- a/libexec/cli/build.exec +++ b/libexec/cli/build.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. # diff --git a/libexec/cli/capability.add.exec b/libexec/cli/capability.add.exec index 502015b497..3843959790 100644 --- a/libexec/cli/capability.add.exec +++ b/libexec/cli/capability.add.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # This software is licensed under a 3-clause BSD license. Please # consult LICENSE file distributed with the sources of this project regarding diff --git a/libexec/cli/capability.drop.exec b/libexec/cli/capability.drop.exec index c968408bd7..e297629f5b 100644 --- a/libexec/cli/capability.drop.exec +++ b/libexec/cli/capability.drop.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # This software is licensed under a 3-clause BSD license. Please # consult LICENSE file distributed with the sources of this project regarding diff --git a/libexec/cli/capability.exec b/libexec/cli/capability.exec index de9747e2fe..2fe7a0480c 100644 --- a/libexec/cli/capability.exec +++ b/libexec/cli/capability.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/cli/capability.list.exec b/libexec/cli/capability.list.exec index b6edd1ab55..3afe4e522e 100644 --- a/libexec/cli/capability.list.exec +++ b/libexec/cli/capability.list.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # This software is licensed under a 3-clause BSD license. Please # consult LICENSE file distributed with the sources of this project regarding diff --git a/libexec/cli/check.exec b/libexec/cli/check.exec index 01b3211388..0271744192 100644 --- a/libexec/cli/check.exec +++ b/libexec/cli/check.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2017, Vanessa Sochat. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at diff --git a/libexec/cli/create.exec b/libexec/cli/create.exec index fde2a7cea5..d9a49c3d66 100644 --- a/libexec/cli/create.exec +++ b/libexec/cli/create.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/cli/exec.exec b/libexec/cli/exec.exec index 8c878f7d0e..90181f34f5 100644 --- a/libexec/cli/exec.exec +++ b/libexec/cli/exec.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/cli/help.exec b/libexec/cli/help.exec index 34eb40cc0b..ce912a0c30 100644 --- a/libexec/cli/help.exec +++ b/libexec/cli/help.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. # Copyright (c) 2017, Vanessa Sochat. All rights reserved. diff --git a/libexec/cli/image.create.exec b/libexec/cli/image.create.exec index 8609725820..6182f1780d 100644 --- a/libexec/cli/image.create.exec +++ b/libexec/cli/image.create.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/cli/image.exec b/libexec/cli/image.exec index 41bebf1f1c..4967e5ea55 100644 --- a/libexec/cli/image.exec +++ b/libexec/cli/image.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/cli/image.expand.exec b/libexec/cli/image.expand.exec index 02ec30023e..4e2088cbe9 100644 --- a/libexec/cli/image.expand.exec +++ b/libexec/cli/image.expand.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/cli/image.export.exec b/libexec/cli/image.export.exec index dc0414e802..c7bb8b5914 100644 --- a/libexec/cli/image.export.exec +++ b/libexec/cli/image.export.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/cli/image.import.exec b/libexec/cli/image.import.exec index 76d602cfaa..30e170913d 100644 --- a/libexec/cli/image.import.exec +++ b/libexec/cli/image.import.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/cli/inspect.exec b/libexec/cli/inspect.exec index c45687132d..6a51370f4c 100644 --- a/libexec/cli/inspect.exec +++ b/libexec/cli/inspect.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2017, Vanessa Sochat. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at diff --git a/libexec/cli/instance.exec b/libexec/cli/instance.exec index de9747e2fe..2fe7a0480c 100644 --- a/libexec/cli/instance.exec +++ b/libexec/cli/instance.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/cli/instance.list.exec b/libexec/cli/instance.list.exec index 91f19670d1..d43f680f70 100644 --- a/libexec/cli/instance.list.exec +++ b/libexec/cli/instance.list.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # This software is licensed under a 3-clause BSD license. Please # consult LICENSE file distributed with the sources of this project regarding diff --git a/libexec/cli/instance.start.exec b/libexec/cli/instance.start.exec index 96c09d4bc7..6ca06a8d23 100644 --- a/libexec/cli/instance.start.exec +++ b/libexec/cli/instance.start.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # This software is licensed under a 3-clause BSD license. Please # consult LICENSE file distributed with the sources of this project regarding diff --git a/libexec/cli/instance.stop.exec b/libexec/cli/instance.stop.exec index 0ddeb7dffc..94eb5972fa 100644 --- a/libexec/cli/instance.stop.exec +++ b/libexec/cli/instance.stop.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # This software is licensed under a 3-clause BSD license. Please # consult LICENSE file distributed with the sources of this project regarding diff --git a/libexec/cli/legacy/bootstrap.exec b/libexec/cli/legacy/bootstrap.exec index 549e959eb4..48146f14a3 100644 --- a/libexec/cli/legacy/bootstrap.exec +++ b/libexec/cli/legacy/bootstrap.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/cli/legacy/copy.exec b/libexec/cli/legacy/copy.exec index 1f6d39a1e3..05b61b0953 100644 --- a/libexec/cli/legacy/copy.exec +++ b/libexec/cli/legacy/copy.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/cli/mount.exec b/libexec/cli/mount.exec index f293727ed2..e000a3a57f 100644 --- a/libexec/cli/mount.exec +++ b/libexec/cli/mount.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/cli/pull.exec b/libexec/cli/pull.exec index 421b0ca354..967d184fef 100644 --- a/libexec/cli/pull.exec +++ b/libexec/cli/pull.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2017, Vanessa Sochat. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at diff --git a/libexec/cli/run.exec b/libexec/cli/run.exec index b8f185a7dc..473fb1322c 100644 --- a/libexec/cli/run.exec +++ b/libexec/cli/run.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/cli/selftest.exec b/libexec/cli/selftest.exec index fefd451255..e3ad050900 100644 --- a/libexec/cli/selftest.exec +++ b/libexec/cli/selftest.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/cli/shell.exec b/libexec/cli/shell.exec index d4078a88e7..8e9d489874 100644 --- a/libexec/cli/shell.exec +++ b/libexec/cli/shell.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/cli/siflist.exec b/libexec/cli/siflist.exec index 2adb3b3e75..3ae4a3ccbf 100644 --- a/libexec/cli/siflist.exec +++ b/libexec/cli/siflist.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/cli/sign.exec b/libexec/cli/sign.exec index 24e7a98cf2..a46d1f093b 100644 --- a/libexec/cli/sign.exec +++ b/libexec/cli/sign.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/cli/test.exec b/libexec/cli/test.exec index a762176fe7..0e11a8db8f 100644 --- a/libexec/cli/test.exec +++ b/libexec/cli/test.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/cli/verify.exec b/libexec/cli/verify.exec index 2212c08633..09447d6fc8 100644 --- a/libexec/cli/verify.exec +++ b/libexec/cli/verify.exec @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/functions b/libexec/functions index f6bf19ed7a..964b16301d 100644 --- a/libexec/functions +++ b/libexec/functions @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/handlers/archive-cpio.sh b/libexec/handlers/archive-cpio.sh index 9c231634e5..1e5ac290ac 100644 --- a/libexec/handlers/archive-cpio.sh +++ b/libexec/handlers/archive-cpio.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. diff --git a/libexec/handlers/archive-tar.sh b/libexec/handlers/archive-tar.sh index 826c0d76dd..6df5f901cb 100644 --- a/libexec/handlers/archive-tar.sh +++ b/libexec/handlers/archive-tar.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. diff --git a/libexec/handlers/image-docker.sh b/libexec/handlers/image-docker.sh index ea0246f7a4..1bffae9a09 100644 --- a/libexec/handlers/image-docker.sh +++ b/libexec/handlers/image-docker.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. diff --git a/libexec/handlers/image-http.sh b/libexec/handlers/image-http.sh index c0de7db0bd..d2acce491a 100644 --- a/libexec/handlers/image-http.sh +++ b/libexec/handlers/image-http.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. diff --git a/libexec/handlers/image-instance.sh b/libexec/handlers/image-instance.sh index a5e2ef817f..892f5e3989 100644 --- a/libexec/handlers/image-instance.sh +++ b/libexec/handlers/image-instance.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. diff --git a/libexec/handlers/image-shub.sh b/libexec/handlers/image-shub.sh index ee49716b7e..d086fe90ee 100644 --- a/libexec/handlers/image-shub.sh +++ b/libexec/handlers/image-shub.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. diff --git a/libexec/helpers/apps/list.sh b/libexec/helpers/apps/list.sh index 2c5b449ab7..46183f2de3 100644 --- a/libexec/helpers/apps/list.sh +++ b/libexec/helpers/apps/list.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2017, Vanessa Sochat. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at diff --git a/libexec/helpers/check.sh b/libexec/helpers/check.sh index f715c657b4..b511bcf372 100644 --- a/libexec/helpers/check.sh +++ b/libexec/helpers/check.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2017, Vanessa Sochat. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at diff --git a/libexec/helpers/checks/1-bash-hiddens.py b/libexec/helpers/checks/1-bash-hiddens.py index f1f28d3e1a..8403b88a94 100755 --- a/libexec/helpers/checks/1-bash-hiddens.py +++ b/libexec/helpers/checks/1-bash-hiddens.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2017, Vanessa Sochat. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this diff --git a/libexec/helpers/checks/1-cache-content.py b/libexec/helpers/checks/1-cache-content.py index d8a0dc9336..7e6d36475b 100755 --- a/libexec/helpers/checks/1-cache-content.py +++ b/libexec/helpers/checks/1-cache-content.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2017, Vanessa Sochat. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this diff --git a/libexec/helpers/checks/1-docker.py b/libexec/helpers/checks/1-docker.py index 02cfe3e019..d5235f8fa7 100755 --- a/libexec/helpers/checks/1-docker.py +++ b/libexec/helpers/checks/1-docker.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2017, Vanessa Sochat. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this diff --git a/libexec/helpers/checks/3-cve.py b/libexec/helpers/checks/3-cve.py index b41d94b5b1..dc9bf38e39 100755 --- a/libexec/helpers/checks/3-cve.py +++ b/libexec/helpers/checks/3-cve.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2017, Vanessa Sochat. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this diff --git a/libexec/helpers/help.sh b/libexec/helpers/help.sh index e20e3b2024..66b41dfd3c 100644 --- a/libexec/helpers/help.sh +++ b/libexec/helpers/help.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. # Copyright (c) 2017, Vanessa Sochat. All rights reserved. diff --git a/libexec/helpers/image.sh b/libexec/helpers/image.sh index 59021049e0..7026ea0e4f 100644 --- a/libexec/helpers/image.sh +++ b/libexec/helpers/image.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/helpers/inspect.sh b/libexec/helpers/inspect.sh index 1a28ede57e..d84225e14a 100644 --- a/libexec/helpers/inspect.sh +++ b/libexec/helpers/inspect.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2017, Vanessa Sochat. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at diff --git a/libexec/helpers/record-env.sh b/libexec/helpers/record-env.sh index 3c7853ca45..23e52dbeb9 100755 --- a/libexec/helpers/record-env.sh +++ b/libexec/helpers/record-env.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/libexec/image-handler.sh b/libexec/image-handler.sh index e4ecb162ea..4f0549eaf3 100644 --- a/libexec/image-handler.sh +++ b/libexec/image-handler.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. # diff --git a/secbuildimg.sh.in b/secbuildimg.sh.in index 6631e57108..dc606d9eec 100755 --- a/secbuildimg.sh.in +++ b/secbuildimg.sh.in @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/singularity.spec.in b/singularity.spec.in index c4f55b549b..cb1ef5f974 100644 --- a/singularity.spec.in +++ b/singularity.spec.in @@ -1,5 +1,5 @@ # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. # diff --git a/src/action-lib/exec.c b/src/action-lib/exec.c index b5d97c4cbd..2758fc0a2d 100644 --- a/src/action-lib/exec.c +++ b/src/action-lib/exec.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include diff --git a/src/action-lib/include.h b/src/action-lib/include.h index 913ea0f63a..c020b25971 100644 --- a/src/action-lib/include.h +++ b/src/action-lib/include.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __ACTION_LIB_H_ @@ -34,4 +34,3 @@ extern int action_appshell(int argc, char **argv); extern int action_apptest(int argc, char **argv); #endif /* __ACTION_LIB_H */ - diff --git a/src/action-lib/ready.c b/src/action-lib/ready.c index ecdcb2c7a7..ddee481f4b 100644 --- a/src/action-lib/ready.c +++ b/src/action-lib/ready.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include diff --git a/src/action-lib/run.c b/src/action-lib/run.c index 32a5e995b9..eff13caece 100644 --- a/src/action-lib/run.c +++ b/src/action-lib/run.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include diff --git a/src/action-lib/shell.c b/src/action-lib/shell.c index 59ff2d6d80..085bc8e109 100644 --- a/src/action-lib/shell.c +++ b/src/action-lib/shell.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include diff --git a/src/action-lib/test.c b/src/action-lib/test.c index cc00803c49..dd7e4b16ab 100644 --- a/src/action-lib/test.c +++ b/src/action-lib/test.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include diff --git a/src/action.c b/src/action.c index a66bb2b7e8..9ce6f1aa84 100644 --- a/src/action.c +++ b/src/action.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ @@ -61,7 +61,7 @@ int main(int argc, char **argv) { singularity_priv_init(); singularity_registry_init(); - + singularity_priv_drop(); singularity_runtime_autofs(); @@ -95,9 +95,9 @@ int main(int argc, char **argv) { } singularity_runtime_enter(); - + singularity_runtime_environment(); - + singularity_priv_drop_perm(); if ( ( target_pwd = singularity_registry_get("TARGET_PWD") ) != NULL ) { @@ -106,7 +106,7 @@ int main(int argc, char **argv) { singularity_message(ERROR, "Could not change directory to: %s\n", target_pwd); ABORT(255); } - } else if ( singularity_registry_get("CONTAIN") != NULL ) { + } else if ( singularity_registry_get("CONTAIN") != NULL ) { singularity_message(DEBUG, "Attempting to chdir to home: %s\n", singularity_priv_home()); if ( chdir(singularity_priv_home()) != 0 ) { singularity_message(WARNING, "Could not chdir to home: %s\n", singularity_priv_home()); diff --git a/src/bootstrap-lib/include.h b/src/bootstrap-lib/include.h index 47801bd3d0..f5276cbdf4 100644 --- a/src/bootstrap-lib/include.h +++ b/src/bootstrap-lib/include.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __BOOTSTRAP_LIB_H_ @@ -28,4 +28,3 @@ extern int bootstrap_keyval_parse(char *path); extern int bootstrap_deffile(void); #endif /* __BOOTSTRAP_LIB_H */ - diff --git a/src/bootstrap-lib/init.c b/src/bootstrap-lib/init.c index 3c442a1fb6..7a75cdf524 100644 --- a/src/bootstrap-lib/init.c +++ b/src/bootstrap-lib/init.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include diff --git a/src/bootstrap-lib/keyval.c b/src/bootstrap-lib/keyval.c index 95d9b89549..2ca5699219 100644 --- a/src/bootstrap-lib/keyval.c +++ b/src/bootstrap-lib/keyval.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include diff --git a/src/bootstrap.c b/src/bootstrap.c index 1759008315..8dbfc00132 100644 --- a/src/bootstrap.c +++ b/src/bootstrap.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ diff --git a/src/builddef.c b/src/builddef.c index 6a8aa52764..59286123dc 100644 --- a/src/builddef.c +++ b/src/builddef.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ diff --git a/src/cleanupd.c b/src/cleanupd.c index 7237184f73..9abfd3a631 100644 --- a/src/cleanupd.c +++ b/src/cleanupd.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ diff --git a/src/copy.c b/src/copy.c index 80f1a1ea5f..5ebeb43662 100644 --- a/src/copy.c +++ b/src/copy.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ diff --git a/src/create.c b/src/create.c index 051fd5d791..94b12cccb6 100644 --- a/src/create.c +++ b/src/create.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ diff --git a/src/docker-extract.c b/src/docker-extract.c index e1f180e6b6..77b7bf8233 100644 --- a/src/docker-extract.c +++ b/src/docker-extract.c @@ -1,3 +1,12 @@ +/* + * + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. + * + * This software is licensed under a customized 3-clause BSD license. Please + * consult LICENSE file distributed with the sources of this project regarding + * your rights to use or distribute this software. + * + */ #define _GNU_SOURCE #include #include diff --git a/src/expand.c b/src/expand.c index f3de0fd368..4f53f56b60 100644 --- a/src/expand.c +++ b/src/expand.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ diff --git a/src/export.c b/src/export.c index 3fc66a9075..bb1054c837 100644 --- a/src/export.c +++ b/src/export.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ diff --git a/src/get-configvals.c b/src/get-configvals.c index ad69cce757..29eb0bfe94 100644 --- a/src/get-configvals.c +++ b/src/get-configvals.c @@ -1,10 +1,10 @@ -/* -* Copyright (c) 2017, SingularityWare, LLC., Inc. All rights reserved. -* +/* +* Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. +* * This software is licensed under a 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. -* +* */ @@ -27,12 +27,12 @@ int main(int argc, char **argv) { singularity_config_init(); - /* - If the key does not exist in the singularity.conf file, this is just + /* + If the key does not exist in the singularity.conf file, this is just going to return "NULL". The function was originally designed to return the default value if the value does not exist in the conf file, but I don't - know how to do that using only strings, and the key needs to be based on - user input, not hardcoded. + know how to do that using only strings, and the key needs to be based on + user input, not hardcoded. */ printf("%s\n", _singularity_config_get_value_impl(argv[1], "NULL")); diff --git a/src/get-keyvals.c b/src/get-keyvals.c index 2ab951bfc8..ac3be8b381 100644 --- a/src/get-keyvals.c +++ b/src/get-keyvals.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #define _GNU_SOURCE @@ -26,9 +26,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include "config.h" diff --git a/src/get-section.c b/src/get-section.c index 7fe7bf836b..0370495984 100644 --- a/src/get-section.c +++ b/src/get-section.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #define _GNU_SOURCE @@ -26,9 +26,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include "config.h" diff --git a/src/image-type.c b/src/image-type.c index e91e5b3838..629190da30 100644 --- a/src/image-type.c +++ b/src/image-type.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ diff --git a/src/import.c b/src/import.c index 19a0a62539..2ab348f31d 100644 --- a/src/import.c +++ b/src/import.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ diff --git a/src/lib/image/bind.c b/src/lib/image/bind.c index 071849aba0..44864f68fb 100644 --- a/src/lib/image/bind.c +++ b/src/lib/image/bind.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -147,4 +147,3 @@ char *singularity_image_bind(struct image_object *image) { return(loop_dev); } - diff --git a/src/lib/image/bind.h b/src/lib/image/bind.h index 1b064bc10e..f698e184a6 100644 --- a/src/lib/image/bind.h +++ b/src/lib/image/bind.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_IMAGE_BIND_H_ @@ -26,4 +26,3 @@ extern char *singularity_image_bind(struct image_object *image); #endif /* __SINGULARITY_IMAGE_BIND_H */ - diff --git a/src/lib/image/dir/include.h b/src/lib/image/dir/include.h index c1a82d30fb..502f6829cc 100644 --- a/src/lib/image/dir/include.h +++ b/src/lib/image/dir/include.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ diff --git a/src/lib/image/dir/init.c b/src/lib/image/dir/init.c index 80c0534415..050ae563f5 100644 --- a/src/lib/image/dir/init.c +++ b/src/lib/image/dir/init.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/lib/image/dir/mount.c b/src/lib/image/dir/mount.c index 018ee4a8dd..05e9e0f1e1 100644 --- a/src/lib/image/dir/mount.c +++ b/src/lib/image/dir/mount.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include @@ -83,4 +83,3 @@ int _singularity_image_dir_mount(struct image_object *image, char *mount_point) return(0); } - diff --git a/src/lib/image/ext3/include.h b/src/lib/image/ext3/include.h index f213c42088..2c712c357f 100644 --- a/src/lib/image/ext3/include.h +++ b/src/lib/image/ext3/include.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ diff --git a/src/lib/image/ext3/init.c b/src/lib/image/ext3/init.c index 62a863cd70..de7caffc0e 100644 --- a/src/lib/image/ext3/init.c +++ b/src/lib/image/ext3/init.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include @@ -26,9 +26,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include "util/message.h" diff --git a/src/lib/image/ext3/mount.c b/src/lib/image/ext3/mount.c index 2118da4f3e..e76b9b5a9d 100644 --- a/src/lib/image/ext3/mount.c +++ b/src/lib/image/ext3/mount.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include @@ -79,4 +79,3 @@ int _singularity_image_ext3_mount(struct image_object *image, char *mount_point) return(0); } - diff --git a/src/lib/image/image.c b/src/lib/image/image.c index d50e815547..ad3947d548 100644 --- a/src/lib/image/image.c +++ b/src/lib/image/image.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include @@ -270,7 +270,7 @@ void singularity_limit_container_groups(struct image_object *image) { void singularity_limit_container_paths(struct image_object *image) { const char *limit_container_paths = singularity_config_get_value(LIMIT_CONTAINER_PATHS); - if ( strcmp(limit_container_paths, "NULL") != 0 ) { + if ( strcmp(limit_container_paths, "NULL") != 0 ) { char image_path[PATH_MAX]; char *path_token = NULL; char *fd_path = NULL; diff --git a/src/lib/image/image.h b/src/lib/image/image.h index 0c261f0b49..42c5b39930 100644 --- a/src/lib/image/image.h +++ b/src/lib/image/image.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/lib/image/sif/include.h b/src/lib/image/sif/include.h index fefbf844c5..1489f9a018 100644 --- a/src/lib/image/sif/include.h +++ b/src/lib/image/sif/include.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * This software is licensed under a 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding diff --git a/src/lib/image/sif/init.c b/src/lib/image/sif/init.c index 21fb06b210..12d1260bf2 100644 --- a/src/lib/image/sif/init.c +++ b/src/lib/image/sif/init.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * This software is licensed under a 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding diff --git a/src/lib/image/squashfs/include.h b/src/lib/image/squashfs/include.h index 3c2da0f0b6..a10cf0e440 100644 --- a/src/lib/image/squashfs/include.h +++ b/src/lib/image/squashfs/include.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ diff --git a/src/lib/image/squashfs/init.c b/src/lib/image/squashfs/init.c index ebca905375..e675b77c4a 100644 --- a/src/lib/image/squashfs/init.c +++ b/src/lib/image/squashfs/init.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include @@ -47,7 +47,7 @@ int _singularity_image_squashfs_init(struct image_object *image, int open_flags) errno = EROFS; return(-1); } - + singularity_message(DEBUG, "Opening file descriptor to image: %s\n", image->path); if ( ( image_fd = open(image->path, open_flags, 0755) ) < 0 ) { singularity_message(ERROR, "Could not open image %s: %s\n", image->path, strerror(errno)); diff --git a/src/lib/image/squashfs/mount.c b/src/lib/image/squashfs/mount.c index a666dd5838..ac5f657758 100644 --- a/src/lib/image/squashfs/mount.c +++ b/src/lib/image/squashfs/mount.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include @@ -67,4 +67,3 @@ int _singularity_image_squashfs_mount(struct image_object *image, char *mount_po return(0); } - diff --git a/src/lib/runtime/autofs/autofs.c b/src/lib/runtime/autofs/autofs.c index 53d17daa46..1689576623 100644 --- a/src/lib/runtime/autofs/autofs.c +++ b/src/lib/runtime/autofs/autofs.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #define _GNU_SOURCE @@ -76,4 +76,3 @@ int _singularity_runtime_autofs(void) { return(0); } - diff --git a/src/lib/runtime/autofs/autofs.h b/src/lib/runtime/autofs/autofs.h index d92c906094..67ae0e63f4 100644 --- a/src/lib/runtime/autofs/autofs.h +++ b/src/lib/runtime/autofs/autofs.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_AUTOFS_H_ @@ -26,4 +26,3 @@ extern int _singularity_runtime_autofs(void); #endif /* __SINGULARITY_RUNTIME_AUTOFS_H */ - diff --git a/src/lib/runtime/enter/chroot/chroot.c b/src/lib/runtime/enter/chroot/chroot.c index ea1d803fe6..13379b83c1 100644 --- a/src/lib/runtime/enter/chroot/chroot.c +++ b/src/lib/runtime/enter/chroot/chroot.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include @@ -79,5 +79,3 @@ int _singularity_runtime_enter_chroot(void) { return(0); } - - diff --git a/src/lib/runtime/enter/chroot/chroot.h b/src/lib/runtime/enter/chroot/chroot.h index 7b703eb62a..528593df10 100644 --- a/src/lib/runtime/enter/chroot/chroot.h +++ b/src/lib/runtime/enter/chroot/chroot.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_ENTER_CHROOT_H_ @@ -26,4 +26,3 @@ extern int _singularity_runtime_enter_chroot(void); #endif /* __SINGULARITY_RUNTIME_ENTER_CHROOT_H */ - diff --git a/src/lib/runtime/enter/enter.c b/src/lib/runtime/enter/enter.c index 03c38684fb..f12f5ec1dc 100644 --- a/src/lib/runtime/enter/enter.c +++ b/src/lib/runtime/enter/enter.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include @@ -43,4 +43,3 @@ int _singularity_runtime_enter(void) { return(retval); } - diff --git a/src/lib/runtime/enter/enter.h b/src/lib/runtime/enter/enter.h index 198ee07097..85a33e5e8f 100644 --- a/src/lib/runtime/enter/enter.h +++ b/src/lib/runtime/enter/enter.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_ENTER_H_ @@ -26,4 +26,3 @@ extern int _singularity_runtime_enter(void); #endif /* __SINGULARITY_RUNTIME_ENTER_H */ - diff --git a/src/lib/runtime/environment/environment.c b/src/lib/runtime/environment/environment.c index 79a2d47637..9642932023 100644 --- a/src/lib/runtime/environment/environment.c +++ b/src/lib/runtime/environment/environment.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #define _GNU_SOURCE @@ -89,7 +89,7 @@ int _singularity_runtime_environment(void) { for(i = 0; i < envlen; i++) { if ( strncmp(envclone[i], "SINGULARITYENV_", 15) == 0 ) { char *tok, *key, *val; - + key = strtok_r(envclone[i], "=", &tok); val = strtok_r(NULL, "\n", &tok); @@ -105,4 +105,3 @@ int _singularity_runtime_environment(void) { return(0); } - diff --git a/src/lib/runtime/environment/environment.h b/src/lib/runtime/environment/environment.h index ebd9dd50da..022dd65031 100644 --- a/src/lib/runtime/environment/environment.h +++ b/src/lib/runtime/environment/environment.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_ENVIRONMENT_H_ @@ -26,4 +26,3 @@ extern int _singularity_runtime_environment(void); #endif /* __SINGULARITY_RUNTIME_ENVIRONMENT_H */ - diff --git a/src/lib/runtime/files/file-bind.c b/src/lib/runtime/files/file-bind.c index 41a464ec03..85b1e340ce 100644 --- a/src/lib/runtime/files/file-bind.c +++ b/src/lib/runtime/files/file-bind.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include diff --git a/src/lib/runtime/files/file-bind.h b/src/lib/runtime/files/file-bind.h index 5251ee9cc3..df1811608b 100644 --- a/src/lib/runtime/files/file-bind.h +++ b/src/lib/runtime/files/file-bind.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ diff --git a/src/lib/runtime/files/files.c b/src/lib/runtime/files/files.c index 85d40c85fb..4b8ef9a12b 100644 --- a/src/lib/runtime/files/files.c +++ b/src/lib/runtime/files/files.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include @@ -50,4 +50,3 @@ int _singularity_runtime_files(void) { return(retval); } - diff --git a/src/lib/runtime/files/files.h b/src/lib/runtime/files/files.h index 5e4f48999d..768fe9021e 100644 --- a/src/lib/runtime/files/files.h +++ b/src/lib/runtime/files/files.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_FILES_H_ @@ -26,4 +26,3 @@ extern int _singularity_runtime_files(void); #endif /* __SINGULARITY_RUNTIME_FILES_H */ - diff --git a/src/lib/runtime/files/group/group.c b/src/lib/runtime/files/group/group.c index bdcd0189a1..c1fc7540db 100644 --- a/src/lib/runtime/files/group/group.c +++ b/src/lib/runtime/files/group/group.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include diff --git a/src/lib/runtime/files/group/group.h b/src/lib/runtime/files/group/group.h index eb47d31b7f..88d98df8bf 100644 --- a/src/lib/runtime/files/group/group.h +++ b/src/lib/runtime/files/group/group.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_FILES_GROUP_H_ @@ -26,4 +26,3 @@ extern int _singularity_runtime_files_group(void); #endif /* __SINGULARITY_RUNTIME_FILES_GROUP_H */ - diff --git a/src/lib/runtime/files/hostname/hostname.c b/src/lib/runtime/files/hostname/hostname.c index e9cdb73517..2155796808 100644 --- a/src/lib/runtime/files/hostname/hostname.c +++ b/src/lib/runtime/files/hostname/hostname.c @@ -1,10 +1,10 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. - * +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. + * * This software is licensed under a 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * */ #include diff --git a/src/lib/runtime/files/hostname/hostname.h b/src/lib/runtime/files/hostname/hostname.h index ee24d6678c..825acefa53 100644 --- a/src/lib/runtime/files/hostname/hostname.h +++ b/src/lib/runtime/files/hostname/hostname.h @@ -1,10 +1,10 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. - * +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. + * * This software is licensed under a 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * */ #ifndef __SINGULARITY_RUNTIME_FILES_HOSTNAME_H_ @@ -13,4 +13,3 @@ extern int _singularity_runtime_files_hostname(void); #endif /* __SINGULARITY_RUNTIME_FILES_HOSTNAME_H */ - diff --git a/src/lib/runtime/files/libs/libs.c b/src/lib/runtime/files/libs/libs.c index 242595d759..387e04b347 100644 --- a/src/lib/runtime/files/libs/libs.c +++ b/src/lib/runtime/files/libs/libs.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef _GNU_SOURCE diff --git a/src/lib/runtime/files/libs/libs.h b/src/lib/runtime/files/libs/libs.h index a9bca99cc6..143c12daf4 100644 --- a/src/lib/runtime/files/libs/libs.h +++ b/src/lib/runtime/files/libs/libs.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_FILES_LIBS_H_ @@ -26,4 +26,3 @@ extern int _singularity_runtime_files_libs(void); #endif /* __SINGULARITY_RUNTIME_FILES_LIBS_H */ - diff --git a/src/lib/runtime/files/passwd/passwd.c b/src/lib/runtime/files/passwd/passwd.c index 58ec774777..b069e60b18 100644 --- a/src/lib/runtime/files/passwd/passwd.c +++ b/src/lib/runtime/files/passwd/passwd.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include diff --git a/src/lib/runtime/files/passwd/passwd.h b/src/lib/runtime/files/passwd/passwd.h index d87fc9363a..bec23035f4 100644 --- a/src/lib/runtime/files/passwd/passwd.h +++ b/src/lib/runtime/files/passwd/passwd.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_FILES_PASSWD_H_ @@ -26,4 +26,3 @@ extern int _singularity_runtime_files_passwd(void); #endif /* __SINGULARITY_RUNTIME_FILES_PASSWD_H */ - diff --git a/src/lib/runtime/files/resolvconf/resolvconf.c b/src/lib/runtime/files/resolvconf/resolvconf.c index 0885e373f3..2893bcfca0 100644 --- a/src/lib/runtime/files/resolvconf/resolvconf.c +++ b/src/lib/runtime/files/resolvconf/resolvconf.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include diff --git a/src/lib/runtime/files/resolvconf/resolvconf.h b/src/lib/runtime/files/resolvconf/resolvconf.h index b86dc29369..3da05b0cb8 100644 --- a/src/lib/runtime/files/resolvconf/resolvconf.h +++ b/src/lib/runtime/files/resolvconf/resolvconf.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_FILES_RESOLVCONF_H_ @@ -26,4 +26,3 @@ extern int _singularity_runtime_files_resolvconf(void); #endif /* __SINGULARITY_RUNTIME_FILES_RESOLVCONF_H */ - diff --git a/src/lib/runtime/mounts/binds/binds.c b/src/lib/runtime/mounts/binds/binds.c index 676c80f587..be1dfe851f 100644 --- a/src/lib/runtime/mounts/binds/binds.c +++ b/src/lib/runtime/mounts/binds/binds.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include @@ -148,4 +148,3 @@ int _singularity_runtime_mount_binds(void) { return(0); } - diff --git a/src/lib/runtime/mounts/binds/binds.h b/src/lib/runtime/mounts/binds/binds.h index 457775d8bd..d1feb6bdd0 100644 --- a/src/lib/runtime/mounts/binds/binds.h +++ b/src/lib/runtime/mounts/binds/binds.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_MOUNT_BINDS_H_ @@ -26,4 +26,3 @@ extern int _singularity_runtime_mount_binds(void); #endif /* __SINGULARITY_RUNTIME_MOUNT_BINDS_H */ - diff --git a/src/lib/runtime/mounts/cwd/cwd.c b/src/lib/runtime/mounts/cwd/cwd.c index 62a6b16917..e2d6833067 100644 --- a/src/lib/runtime/mounts/cwd/cwd.c +++ b/src/lib/runtime/mounts/cwd/cwd.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef _GNU_SOURCE @@ -130,7 +130,7 @@ int _singularity_runtime_mount_cwd(void) { singularity_message(WARNING, "Not mounting current directory: host does not support PR_SET_NO_NEW_PRIVS\n"); free(cwd_path); return(0); -#endif +#endif singularity_message(VERBOSE, "Binding '%s' to '%s/%s'\n", cwd_path, container_dir, cwd_path); singularity_priv_escalate(); @@ -146,4 +146,3 @@ int _singularity_runtime_mount_cwd(void) { free(cwd_path); return(0); } - diff --git a/src/lib/runtime/mounts/cwd/cwd.h b/src/lib/runtime/mounts/cwd/cwd.h index b539d42774..c92fc5c2d5 100644 --- a/src/lib/runtime/mounts/cwd/cwd.h +++ b/src/lib/runtime/mounts/cwd/cwd.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_MOUNT_CWD_H_ @@ -26,4 +26,3 @@ extern int _singularity_runtime_mount_cwd(void); #endif /* __SINGULARITY_RUNTIME_MOUNT_CWD_H */ - diff --git a/src/lib/runtime/mounts/dev/dev.c b/src/lib/runtime/mounts/dev/dev.c index c408d85ade..fa4db0a423 100644 --- a/src/lib/runtime/mounts/dev/dev.c +++ b/src/lib/runtime/mounts/dev/dev.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * @@ -84,7 +84,7 @@ int _singularity_runtime_mount_dev(void) { if ( singularity_config_get_bool_char(MOUNT_DEVPTS) > 0 ) { struct stat multi_instance_devpts; - + if( stat("/dev/pts/ptmx", &multi_instance_devpts) < 0 ) { singularity_message(ERROR, "Multiple devpts instances unsupported and \"%s\" configured\n", MOUNT_DEVPTS); ABORT(255); diff --git a/src/lib/runtime/mounts/dev/dev.h b/src/lib/runtime/mounts/dev/dev.h index f68e6eaeba..5a92a15bca 100644 --- a/src/lib/runtime/mounts/dev/dev.h +++ b/src/lib/runtime/mounts/dev/dev.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_MOUNT_DEV_H_ @@ -26,4 +26,3 @@ extern int _singularity_runtime_mount_dev(void); #endif /* __SINGULARITY_RUNTIME_MOUNT_DEV_H */ - diff --git a/src/lib/runtime/mounts/home/home.c b/src/lib/runtime/mounts/home/home.c index 0a9b69b93c..a2bd5c4058 100644 --- a/src/lib/runtime/mounts/home/home.c +++ b/src/lib/runtime/mounts/home/home.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include diff --git a/src/lib/runtime/mounts/home/home.h b/src/lib/runtime/mounts/home/home.h index a54a77313e..1c4907d4b8 100644 --- a/src/lib/runtime/mounts/home/home.h +++ b/src/lib/runtime/mounts/home/home.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_MOUNT_HOME_H_ @@ -26,4 +26,3 @@ extern int _singularity_runtime_mount_home(void); #endif /* __SINGULARITY_RUNTIME_MOUNT_HOME_H */ - diff --git a/src/lib/runtime/mounts/hostfs/hostfs.c b/src/lib/runtime/mounts/hostfs/hostfs.c index cf25a9fc77..b3ca0f556a 100644 --- a/src/lib/runtime/mounts/hostfs/hostfs.c +++ b/src/lib/runtime/mounts/hostfs/hostfs.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include diff --git a/src/lib/runtime/mounts/hostfs/hostfs.h b/src/lib/runtime/mounts/hostfs/hostfs.h index 5e093e899a..72d1bbbd6f 100644 --- a/src/lib/runtime/mounts/hostfs/hostfs.h +++ b/src/lib/runtime/mounts/hostfs/hostfs.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_MOUNT_HOSTFS_H_ @@ -26,4 +26,3 @@ extern int _singularity_runtime_mount_hostfs(void); #endif /* __SINGULARITY_RUNTIME_MOUNT_HOSTFS_H */ - diff --git a/src/lib/runtime/mounts/kernelfs/kernelfs.c b/src/lib/runtime/mounts/kernelfs/kernelfs.c index dd07ffde0c..76e608f507 100644 --- a/src/lib/runtime/mounts/kernelfs/kernelfs.c +++ b/src/lib/runtime/mounts/kernelfs/kernelfs.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include diff --git a/src/lib/runtime/mounts/kernelfs/kernelfs.h b/src/lib/runtime/mounts/kernelfs/kernelfs.h index cdf014c188..18dbbe0b33 100644 --- a/src/lib/runtime/mounts/kernelfs/kernelfs.h +++ b/src/lib/runtime/mounts/kernelfs/kernelfs.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_MOUNT_KERNELFS_H_ @@ -26,4 +26,3 @@ extern int _singularity_runtime_mount_kernelfs(void); #endif /* __SINGULARITY_RUNTIME_MOUNT_KERNELFS_H */ - diff --git a/src/lib/runtime/mounts/mounts.c b/src/lib/runtime/mounts/mounts.c index 53aca95c99..1741ce89b5 100644 --- a/src/lib/runtime/mounts/mounts.c +++ b/src/lib/runtime/mounts/mounts.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include @@ -60,4 +60,3 @@ int _singularity_runtime_mounts(void) { return(retval); } - diff --git a/src/lib/runtime/mounts/mounts.h b/src/lib/runtime/mounts/mounts.h index 7921ae3999..b6f21bbe62 100644 --- a/src/lib/runtime/mounts/mounts.h +++ b/src/lib/runtime/mounts/mounts.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_MOUNT_H_ @@ -26,4 +26,3 @@ extern int _singularity_runtime_mounts(void); #endif /* __SINGULARITY_RUNTIME_MOUNT_H */ - diff --git a/src/lib/runtime/mounts/scratch/scratch.c b/src/lib/runtime/mounts/scratch/scratch.c index 3b81831136..94d6137ab2 100644 --- a/src/lib/runtime/mounts/scratch/scratch.c +++ b/src/lib/runtime/mounts/scratch/scratch.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include @@ -67,7 +67,7 @@ int _singularity_runtime_mount_scratch(void) { #ifndef SINGULARITY_NO_NEW_PRIVS singularity_message(WARNING, "Not mounting scratch: host does not support PR_SET_NO_NEW_PRIVS\n"); return(0); -#endif +#endif singularity_message(DEBUG, "Checking SINGULARITY_WORKDIR from environment\n"); if ( ( tmpdir_path = singularity_registry_get("WORKDIR") ) == NULL ) { @@ -138,4 +138,3 @@ int _singularity_runtime_mount_scratch(void) { } return(0); } - diff --git a/src/lib/runtime/mounts/scratch/scratch.h b/src/lib/runtime/mounts/scratch/scratch.h index fa23836dfc..ba7bd9fbe1 100644 --- a/src/lib/runtime/mounts/scratch/scratch.h +++ b/src/lib/runtime/mounts/scratch/scratch.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_MOUNT_SCRATCH_H_ @@ -26,4 +26,3 @@ extern int _singularity_runtime_mount_scratch(void); #endif /* __SINGULARITY_RUNTIME_MOUNT_SCRATCH_H */ - diff --git a/src/lib/runtime/mounts/tmp/tmp.c b/src/lib/runtime/mounts/tmp/tmp.c index ae29e75175..8e31496841 100644 --- a/src/lib/runtime/mounts/tmp/tmp.c +++ b/src/lib/runtime/mounts/tmp/tmp.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include diff --git a/src/lib/runtime/mounts/tmp/tmp.h b/src/lib/runtime/mounts/tmp/tmp.h index c07127db74..54728fdf0a 100644 --- a/src/lib/runtime/mounts/tmp/tmp.h +++ b/src/lib/runtime/mounts/tmp/tmp.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_MOUNT_TMP_H_ @@ -26,4 +26,3 @@ extern int _singularity_runtime_mount_tmp(void); #endif /* __SINGULARITY_RUNTIME_MOUNT_TMP_H */ - diff --git a/src/lib/runtime/mounts/userbinds/userbinds.c b/src/lib/runtime/mounts/userbinds/userbinds.c index 6b3bef09f7..f05a6ab8c7 100644 --- a/src/lib/runtime/mounts/userbinds/userbinds.c +++ b/src/lib/runtime/mounts/userbinds/userbinds.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #include @@ -189,4 +189,3 @@ int _singularity_runtime_mount_userbinds(void) { } return(0); } - diff --git a/src/lib/runtime/mounts/userbinds/userbinds.h b/src/lib/runtime/mounts/userbinds/userbinds.h index 2cad42f948..decca14e91 100644 --- a/src/lib/runtime/mounts/userbinds/userbinds.h +++ b/src/lib/runtime/mounts/userbinds/userbinds.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_MOUNT_USERBINDS_H_ @@ -26,4 +26,3 @@ extern int _singularity_runtime_mount_userbinds(void); #endif /* __SINGULARITY_RUNTIME_MOUNT_USERBINDS_H */ - diff --git a/src/lib/runtime/ns/ipc/ipc.c b/src/lib/runtime/ns/ipc/ipc.c index 7aab84c59c..b802011493 100644 --- a/src/lib/runtime/ns/ipc/ipc.c +++ b/src/lib/runtime/ns/ipc/ipc.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #define _GNU_SOURCE @@ -92,7 +92,7 @@ int _singularity_runtime_ns_ipc_join(int ns_fd) { singularity_message(ERROR, "Could not open IPC NS fd: %s\n", strerror(errno)); ABORT(255); } - + singularity_message(DEBUG, "Attempting to join IPC namespace\n"); if ( setns(ipc_fd, CLONE_NEWIPC) < 0 ) { singularity_message(ERROR, "Could not join IPC namespace: %s\n", strerror(errno)); diff --git a/src/lib/runtime/ns/ipc/ipc.h b/src/lib/runtime/ns/ipc/ipc.h index 12bfcc5887..b7ac34a670 100644 --- a/src/lib/runtime/ns/ipc/ipc.h +++ b/src/lib/runtime/ns/ipc/ipc.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_NS_IPC_H_ @@ -27,4 +27,3 @@ extern int _singularity_runtime_ns_ipc(void); extern int _singularity_runtime_ns_ipc_join(int ns_fd); #endif /* __SINGULARITY_RUNTIME_NS_IPC_H */ - diff --git a/src/lib/runtime/ns/mnt/mnt.c b/src/lib/runtime/ns/mnt/mnt.c index 8a043aed43..ea4819f6ba 100644 --- a/src/lib/runtime/ns/mnt/mnt.c +++ b/src/lib/runtime/ns/mnt/mnt.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #define _GNU_SOURCE @@ -109,7 +109,7 @@ int _singularity_runtime_ns_mnt_join(int ns_fd) { singularity_message(ERROR, "Could not open mount NS fd: %s\n", strerror(errno)); ABORT(255); } - + singularity_message(DEBUG, "Attempting to join mount namespace\n"); if ( setns(mnt_fd, CLONE_NEWNS) < 0 ) { singularity_message(ERROR, "Could not join mount namespace: %s\n", strerror(errno)); @@ -119,7 +119,7 @@ int _singularity_runtime_ns_mnt_join(int ns_fd) { singularity_message(DEBUG, "Successfully joined mount namespace\n"); close(mnt_fd); - return(0); + return(0); } /* diff --git a/src/lib/runtime/ns/mnt/mnt.h b/src/lib/runtime/ns/mnt/mnt.h index 3a5a086276..9283f1a612 100644 --- a/src/lib/runtime/ns/mnt/mnt.h +++ b/src/lib/runtime/ns/mnt/mnt.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_NS_MNT_H_ @@ -27,4 +27,3 @@ extern int _singularity_runtime_ns_mnt(void); extern int _singularity_runtime_ns_mnt_join(int ns_fd); #endif /* __SINGULARITY_RUNTIME_NS_MNT_H */ - diff --git a/src/lib/runtime/ns/net/net.c b/src/lib/runtime/ns/net/net.c index 545e5b0b9b..d0c1dec312 100644 --- a/src/lib/runtime/ns/net/net.c +++ b/src/lib/runtime/ns/net/net.c @@ -1,10 +1,10 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. - * +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. + * * This software is licensed under a 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * */ #define _GNU_SOURCE @@ -38,7 +38,7 @@ static int enabled = -1; int _singularity_runtime_ns_net(void) { int sockfd; struct ifreq req; - + if ( singularity_registry_get("UNSHARE_NET") == NULL ) { singularity_message(VERBOSE2, "Not virtualizing network namespace on user request\n"); return(0); @@ -66,7 +66,7 @@ int _singularity_runtime_ns_net(void) { singularity_message(ERROR, "Unable to open AF_INET socket: %s\n", strerror(errno)); ABORT(255); } - + memset(&req, 0, sizeof(req)); strncpy(req.ifr_name, "lo", IFNAMSIZ); @@ -79,7 +79,7 @@ int _singularity_runtime_ns_net(void) { ABORT(255); } singularity_priv_drop(); - + return(0); } @@ -99,7 +99,7 @@ int _singularity_runtime_ns_net_join(int ns_fd) { singularity_message(ERROR, "Could not open NET NS fd: %s\n", strerror(errno)); ABORT(255); } - + singularity_message(DEBUG, "Attempting to join NET namespace\n"); if ( setns(net_fd, CLONE_NEWNET) < 0 ) { singularity_message(ERROR, "Could not join NET namespace: %s\n", strerror(errno)); diff --git a/src/lib/runtime/ns/net/net.h b/src/lib/runtime/ns/net/net.h index d9da0fe635..3094f54311 100644 --- a/src/lib/runtime/ns/net/net.h +++ b/src/lib/runtime/ns/net/net.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * This software is licensed under a 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding diff --git a/src/lib/runtime/ns/ns.c b/src/lib/runtime/ns/ns.c index f54d86f032..a9bd421c5d 100644 --- a/src/lib/runtime/ns/ns.c +++ b/src/lib/runtime/ns/ns.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #define _GNU_SOURCE diff --git a/src/lib/runtime/ns/ns.h b/src/lib/runtime/ns/ns.h index d95b6c769f..21f6a0d9c2 100644 --- a/src/lib/runtime/ns/ns.h +++ b/src/lib/runtime/ns/ns.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_NS_H_ diff --git a/src/lib/runtime/ns/pid/pid.c b/src/lib/runtime/ns/pid/pid.c index 308bdbbb10..473a6d7cce 100644 --- a/src/lib/runtime/ns/pid/pid.c +++ b/src/lib/runtime/ns/pid/pid.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/lib/runtime/ns/pid/pid.h b/src/lib/runtime/ns/pid/pid.h index ef98ac2fc7..34fd2c93f7 100644 --- a/src/lib/runtime/ns/pid/pid.h +++ b/src/lib/runtime/ns/pid/pid.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/lib/runtime/ns/user/user.c b/src/lib/runtime/ns/user/user.c index a64d47754b..fbcf5f29c1 100644 --- a/src/lib/runtime/ns/user/user.c +++ b/src/lib/runtime/ns/user/user.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * This software is licensed under a 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding diff --git a/src/lib/runtime/ns/user/user.h b/src/lib/runtime/ns/user/user.h index 2142d3428f..9c7c4fd6df 100644 --- a/src/lib/runtime/ns/user/user.h +++ b/src/lib/runtime/ns/user/user.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * This software is licensed under a 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding diff --git a/src/lib/runtime/ns/uts/uts.c b/src/lib/runtime/ns/uts/uts.c index f6c9d26066..5179924fbf 100644 --- a/src/lib/runtime/ns/uts/uts.c +++ b/src/lib/runtime/ns/uts/uts.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * This software is licensed under a 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding diff --git a/src/lib/runtime/ns/uts/uts.h b/src/lib/runtime/ns/uts/uts.h index 8c383bc5eb..78ea679460 100644 --- a/src/lib/runtime/ns/uts/uts.h +++ b/src/lib/runtime/ns/uts/uts.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * This software is licensed under a 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding diff --git a/src/lib/runtime/overlayfs/overlayfs.c b/src/lib/runtime/overlayfs/overlayfs.c index 8553fff6e9..6c4fe1b51e 100644 --- a/src/lib/runtime/overlayfs/overlayfs.c +++ b/src/lib/runtime/overlayfs/overlayfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/lib/runtime/overlayfs/overlayfs.h b/src/lib/runtime/overlayfs/overlayfs.h index 0d580eb5a5..52ce524306 100644 --- a/src/lib/runtime/overlayfs/overlayfs.h +++ b/src/lib/runtime/overlayfs/overlayfs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/lib/runtime/runtime.c b/src/lib/runtime/runtime.c index f5931f989d..def75a8d57 100644 --- a/src/lib/runtime/runtime.c +++ b/src/lib/runtime/runtime.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #define _GNU_SOURCE @@ -57,7 +57,7 @@ int singularity_runtime_ns(unsigned int flags) { if ( singularity_registry_get("DAEMON_JOIN") ) { return(_singularity_runtime_ns_join(flags)); } - + return(_singularity_runtime_ns(flags)); } diff --git a/src/lib/runtime/runtime.h b/src/lib/runtime/runtime.h index 1b1fb6fb69..198ba835c6 100644 --- a/src/lib/runtime/runtime.h +++ b/src/lib/runtime/runtime.h @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ #ifndef __SINGULARITY_RUNTIME_H_ @@ -54,4 +54,3 @@ extern int singularity_runtime_environment(void); extern int singularity_runtime_autofs(void); #endif /* __SINGULARITY_RUNTIME_H */ - diff --git a/src/lib/sif/list.c b/src/lib/sif/list.c index 16587d2ed4..2c15f50429 100644 --- a/src/lib/sif/list.c +++ b/src/lib/sif/list.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2017, Yannick Cote . All rights reserved. * diff --git a/src/lib/sif/list.h b/src/lib/sif/list.h index c8de84ecc2..cc2a211041 100644 --- a/src/lib/sif/list.h +++ b/src/lib/sif/list.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2017, Yannick Cote . All rights reserved. * diff --git a/src/lib/sif/sif.c b/src/lib/sif/sif.c index 5f1b12679c..9826055ca7 100644 --- a/src/lib/sif/sif.c +++ b/src/lib/sif/sif.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * Copyright (c) 2017, Yannick Cote All rights reserved. * * See the COPYRIGHT.md file at the top-level directory of this distribution and at diff --git a/src/lib/sif/sif.h b/src/lib/sif/sif.h index 463aa5c9c6..dd606c5fbb 100644 --- a/src/lib/sif/sif.h +++ b/src/lib/sif/sif.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * Copyright (c) 2017, Yannick Cote All rights reserved. * * See the COPYRIGHT.md file at the top-level directory of this distribution and at diff --git a/src/lib/sif/sifaccess.c b/src/lib/sif/sifaccess.c index 5bc81f697f..c0898e8bca 100644 --- a/src/lib/sif/sifaccess.c +++ b/src/lib/sif/sifaccess.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * Copyright (c) 2017, Yannick Cote All rights reserved. * * See the COPYRIGHT.md file at the top-level directory of this distribution and at diff --git a/src/lib/sif/sifaccess.h b/src/lib/sif/sifaccess.h index 08ff39c6b3..6b6ce6fdfd 100644 --- a/src/lib/sif/sifaccess.h +++ b/src/lib/sif/sifaccess.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * Copyright (c) 2017, Yannick Cote All rights reserved. * * See the COPYRIGHT.md file at the top-level directory of this distribution and at diff --git a/src/lib/signing/crypt.c b/src/lib/signing/crypt.c index 198b31096a..bd4ececb1a 100644 --- a/src/lib/signing/crypt.c +++ b/src/lib/signing/crypt.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * Copyright (c) 2017, Yannick Cote All rights reserved. * * See the COPYRIGHT.md file at the top-level directory of this distribution and at diff --git a/src/lib/signing/crypt.h b/src/lib/signing/crypt.h index 816750ad33..da2a55e379 100644 --- a/src/lib/signing/crypt.h +++ b/src/lib/signing/crypt.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * Copyright (c) 2017, Yannick Cote All rights reserved. * * See the COPYRIGHT.md file at the top-level directory of this distribution and at diff --git a/src/mount.c b/src/mount.c index 0c417f20fb..e8351b43bc 100644 --- a/src/mount.c +++ b/src/mount.c @@ -1,23 +1,23 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. - * + * * Copyright (c) 2016-2017, The Regents of the University of California, * through Lawrence Berkeley National Laboratory (subject to receipt of any * required approvals from the U.S. Dept. of Energy). All rights reserved. - * + * * This software is licensed under a customized 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * * NOTICE. This Software was developed under funding from the U.S. Department of * Energy and the U.S. Government consequently retains certain rights. As such, * the U.S. Government has been granted for itself and others acting on its * behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software * to reproduce, distribute copies to the public, prepare derivative works, and - * perform publicly and display publicly, and to permit other to do so. - * + * perform publicly and display publicly, and to permit other to do so. + * */ diff --git a/src/sif.c b/src/sif.c index 382caf55a9..62679ed154 100644 --- a/src/sif.c +++ b/src/sif.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * Copyright (c) 2017, Yannick Cote All rights reserved. * * See the COPYRIGHT.md file at the top-level directory of this distribution and at diff --git a/src/slurm/singularity.c b/src/slurm/singularity.c index 3ffbae85ee..179ad0f2dc 100644 --- a/src/slurm/singularity.c +++ b/src/slurm/singularity.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/start.c b/src/start.c index 5493bcfd6d..f288a4cbcd 100644 --- a/src/start.c +++ b/src/start.c @@ -1,10 +1,10 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. - * +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. + * * This software is licensed under a 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * */ @@ -169,7 +169,7 @@ int main(int argc, char **argv) { /* Close all open fd's that may be present besides daemon info file fd */ singularity_message(DEBUG, "Closing open fd's\n"); - for( i = sysconf(_SC_OPEN_MAX); i > 2; i-- ) { + for( i = sysconf(_SC_OPEN_MAX); i > 2; i-- ) { if ( i != cleanupd_fd ) { if ( fstat(i, &filestat) == 0 ) { if ( S_ISFIFO(filestat.st_mode) != 0 ) { @@ -183,7 +183,7 @@ int main(int argc, char **argv) { singularity_debug = make_logfile("singularity-debug"); stdout_log = make_logfile("stdout"); stderr_log = make_logfile("stderr"); - + for( i = 0; i <= 2; i++ ) { close(i); } @@ -201,7 +201,7 @@ int main(int argc, char **argv) { } child = fork(); - + if ( child == 0 ) { /* Make standard output and standard error files to log stdout & stderr into */ if ( stdout_log != NULL ) { diff --git a/src/util/capability.c b/src/util/capability.c index 895afd6ee5..3a70b6975d 100644 --- a/src/util/capability.c +++ b/src/util/capability.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * This software is licensed under a 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding diff --git a/src/util/capability.h b/src/util/capability.h index 66886ee42f..533f5ce1c5 100644 --- a/src/util/capability.h +++ b/src/util/capability.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * This software is licensed under a 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding diff --git a/src/util/cleanupd.h b/src/util/cleanupd.h index 12274f3013..2176f681e0 100644 --- a/src/util/cleanupd.h +++ b/src/util/cleanupd.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/util/config_defaults.h.in b/src/util/config_defaults.h.in index d4009b40d5..94c460e8cb 100644 --- a/src/util/config_defaults.h.in +++ b/src/util/config_defaults.h.in @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/util/config_parser.c b/src/util/config_parser.c index 02eb808844..be4795e8d8 100644 --- a/src/util/config_parser.c +++ b/src/util/config_parser.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/util/config_parser.h b/src/util/config_parser.h index 4941f5d25c..034644456f 100644 --- a/src/util/config_parser.h +++ b/src/util/config_parser.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/util/daemon.c b/src/util/daemon.c index 909e10fe9f..2007fd0a36 100644 --- a/src/util/daemon.c +++ b/src/util/daemon.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * This software is licensed under a 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding diff --git a/src/util/daemon.h b/src/util/daemon.h index 19be078eef..4e2827ccd6 100644 --- a/src/util/daemon.h +++ b/src/util/daemon.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * This software is licensed under a 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding diff --git a/src/util/file.c b/src/util/file.c index 121477ba27..3fcd5a58c4 100644 --- a/src/util/file.c +++ b/src/util/file.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/util/file.h b/src/util/file.h index aee5e61b93..9714651ac0 100644 --- a/src/util/file.h +++ b/src/util/file.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/util/fork.c b/src/util/fork.c index 8906264e9d..f181c1cbde 100644 --- a/src/util/fork.c +++ b/src/util/fork.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * Copyright (c) 2016, Brian Bockelman. All rights reserved. * * Copyright (c) 2016-2017, The Regents of the University of California, diff --git a/src/util/fork.h b/src/util/fork.h index cc29460974..12b314cfe6 100644 --- a/src/util/fork.h +++ b/src/util/fork.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * Copyright (c) 2016, Brian Bockelman. All rights reserved. * * Copyright (c) 2016-2017, The Regents of the University of California, diff --git a/src/util/message.c b/src/util/message.c index 23e8b0a6d1..402565bdde 100644 --- a/src/util/message.c +++ b/src/util/message.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/util/message.h b/src/util/message.h index 64ca9622c5..2f0b1e308f 100644 --- a/src/util/message.h +++ b/src/util/message.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/util/mount.c b/src/util/mount.c index 2c4a230303..4948e1c249 100644 --- a/src/util/mount.c +++ b/src/util/mount.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * See the COPYRIGHT.md file at the top-level directory of this distribution and at * https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/src/util/mount.h b/src/util/mount.h index 22003bad6f..729aa7ef53 100644 --- a/src/util/mount.h +++ b/src/util/mount.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * See the COPYRIGHT.md file at the top-level directory of this distribution and at * https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/src/util/privilege.c b/src/util/privilege.c index 95c809cc7b..8b7eeb339e 100644 --- a/src/util/privilege.c +++ b/src/util/privilege.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/util/privilege.h b/src/util/privilege.h index 0fcab0f2fc..cd6ec802d2 100644 --- a/src/util/privilege.h +++ b/src/util/privilege.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/util/registry.c b/src/util/registry.c index 9c70ef8477..a8bc8dc25d 100644 --- a/src/util/registry.c +++ b/src/util/registry.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/util/registry.h b/src/util/registry.h index e48d2ef6b3..3fd690e888 100644 --- a/src/util/registry.h +++ b/src/util/registry.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/util/sessiondir.h b/src/util/sessiondir.h index abe4d4e236..7789b8442b 100644 --- a/src/util/sessiondir.h +++ b/src/util/sessiondir.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/util/setns.c b/src/util/setns.c index 67f926ec72..c592e94d20 100644 --- a/src/util/setns.c +++ b/src/util/setns.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * See the COPYRIGHT.md file at the top-level directory of this distribution and at * https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/src/util/setns.h b/src/util/setns.h index 0ad947e7f6..c08facf4cf 100644 --- a/src/util/setns.h +++ b/src/util/setns.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * See the COPYRIGHT.md file at the top-level directory of this distribution and at * https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/src/util/signal.c b/src/util/signal.c index 83758ad1e1..477bd7589d 100644 --- a/src/util/signal.c +++ b/src/util/signal.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * This software is licensed under a 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding diff --git a/src/util/signal.h b/src/util/signal.h index 2091e18f22..ffbd8eb547 100644 --- a/src/util/signal.h +++ b/src/util/signal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * This software is licensed under a 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding diff --git a/src/util/suid.c b/src/util/suid.c index d529fea1a3..1de11407f3 100644 --- a/src/util/suid.c +++ b/src/util/suid.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/util/suid.h b/src/util/suid.h index a6ca2d5491..85e9504fa1 100644 --- a/src/util/suid.h +++ b/src/util/suid.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/util/util.c b/src/util/util.c index 7b77e375ff..e2f71d2b60 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/util/util.h b/src/util/util.h index 317a1db28a..6f3ffa3257 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. * * Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. * diff --git a/src/wrapper.c b/src/wrapper.c index 5a0075c200..787233f540 100644 --- a/src/wrapper.c +++ b/src/wrapper.c @@ -1,10 +1,10 @@ -/* - * Copyright (c) 2017, SingularityWare, LLC. All rights reserved. - * +/* + * Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. + * * This software is licensed under a 3-clause BSD license. Please * consult LICENSE file distributed with the sources of this project regarding * your rights to use or distribute this software. - * + * */ diff --git a/test.sh.in b/test.sh.in index 8b11aa1766..299dcc694b 100755 --- a/test.sh.in +++ b/test.sh.in @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved. # diff --git a/tests/20-build.sh b/tests/20-build.sh index 5f4eb2bcc6..ababb6c248 100755 --- a/tests/20-build.sh +++ b/tests/20-build.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/tests/23-bootstrap_apps.sh b/tests/23-bootstrap_apps.sh index 7cc0434a16..38e4766a8b 100644 --- a/tests/23-bootstrap_apps.sh +++ b/tests/23-bootstrap_apps.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # Copyright (c) 2017, Vanessa Sochat. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at diff --git a/tests/23-pull.sh b/tests/23-pull.sh index 5bbdc82173..95f77770cb 100755 --- a/tests/23-pull.sh +++ b/tests/23-pull.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md. diff --git a/tests/29-instance.sh b/tests/29-instance.sh index f3687810a1..3d9ac7827e 100755 --- a/tests/29-instance.sh +++ b/tests/29-instance.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2017, SingularityWare, LLC. All rights reserved. +# Copyright (c) 2017-2018, Sylabs, Inc. All rights reserved. # # See the COPYRIGHT.md file at the top-level directory of this distribution and at # https://github.com/singularityware/singularity/blob/master/COPYRIGHT.md.