Sfoglia il codice sorgente

* Move grab_vcsa to fixes as well

git-svn-id: branches/fixes_2_0@2028 -
daniel 20 anni fa
parent
commit
f967bcc5ed
4 ha cambiato i file con 2 aggiunte e 119 eliminazioni
  1. 0 1
      .gitattributes
  2. 1 9
      rtl/linux/Makefile
  3. 0 95
      rtl/linux/grab_vcsa.pp
  4. 1 14
      utils/Makefile

+ 0 - 1
.gitattributes

@@ -3651,7 +3651,6 @@ rtl/linux/bunxsysc.inc svneol=native#text/plain
 rtl/linux/errno.inc svneol=native#text/plain
 rtl/linux/fpcylix.pp svneol=native#text/plain
 rtl/linux/gpm.pp svneol=native#text/plain
-rtl/linux/grab_vcsa.pp -text
 rtl/linux/i386/bsyscall.inc svneol=native#text/plain
 rtl/linux/i386/cprt0.as -text
 rtl/linux/i386/cprt21.as -text

+ 1 - 9
rtl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/12/14]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/11/26]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -1898,14 +1898,6 @@ override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
 endif
-override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
-override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
-ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))
-override ACROSSCOMPILE=1
-endif
-ifdef ACROSSCOMPILE
-override FPCOPT+=$(CROSSOPT)
-endif
 override COMPILER:=$(FPC) $(FPCOPT)
 ifeq (,$(findstring -s ,$(COMPILER)))
 EXECPPAS=

+ 0 - 95
rtl/linux/grab_vcsa.pp

@@ -1,95 +0,0 @@
-program grab_vcsa;
-
-{
-    This file is part of the Free Pascal run time library.
-    Copyright (c) 2005 by Daniël Mantione
-     member of the Free Pascal development team.
-
-    VCSA grabber program for Linux.
-
-    See the file COPYING.FPC, included in this distribution,
-    for details about the copyright.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-}
-
-uses baseunix,termio;
-
-{This program helps the video unit to use /dev/vcsa* to provide high
- quality output.
-
- Normally, when you login, the owner of the tty you are running on,
- /dev/tty0-31 is set to your username. Weird enough, this is not done
- with the video buffer devices belonging to that tty, /dev/vcs0-31
- and /dev/vcsa0-31. This makes it impossible to do high quality text
- mode video output.
-
- This program, designed to be run suid root, reads the owner and mode
- of the tty, and assigns them to the corresponding vcs and vcsa device.}
-
-{Security design:
-
- - It has been checked if the user can provide any input to the program.
-   The only input in the program is stdinputhandle, which cannot be
-   controlled by the user. The user has therefore no control in any way 
-   about the code flow in the program; the code that is going to be
-   executed is fixed no matter what a user does.
-
- - Outputs are the file permissions of /dev/vcs* and /dev/vcsa*. It has
-   been considered if users could use the program this way to gain rights
-   they should not have. By having access to /dev/vcs* and /dev/vcsa*
-   the user can garble his own screen. This should not be a problem.
-
-   After the user has logged out /dev/vcs* and /dev/vcsa* are automatically
-   changed back to root. This removes the need for us to change permissions
-   back again. If we would change permissions back, it would be useless, the
-   user can kill the process before it changes back permissions.
-
- - Normal users cannot write to /dev/ and can therefore not use the program
-   do change the permissions of other files than the actual devices.
-}
-
-const   result_success=0;
-        result_not_on_console=1;
-        result_stat_error=2;
-        result_chown_error=3;
-        result_chmod_error=4;
-
-var thistty:string;
-    vcs,vcsa:string;
-    ttystat:stat;
-
-begin
-  exitcode:=result_not_on_console;
-  thistty:=ttyname(stdinputhandle);
-  if isatty(stdinputhandle)=1 then
-    begin
-      { running on a tty, find out whether locally or remotely }
-      if (length(thistty)>=9) and
-         (copy(thistty,1,8)='/dev/tty') and
-         (thistty[9] in ['0'..'9']) then
-        begin
-          {We are running on the Linux console}
-          if fpstat(thistty,ttystat)<>0 then
-            halt(result_stat_error);
-          vcs:='/dev/vcs'+copy(thistty,9,255);
-          vcsa:='/dev/vcsa'+copy(thistty,9,255);
-          
-          {Change owner and group to that of /dev/tty??.}
-          if fpchown(vcs,ttystat.uid,ttystat.gid)<>0 then
-            halt(result_chown_error);
-          if fpchown(vcsa,ttystat.uid,ttystat.gid)<>0 then
-            halt(result_chown_error);
-
-          {Change permissions to that of /dev/tty??.}
-          if fpchmod(vcs,ttystat.mode)<>0 then
-            halt(result_chmod_error);
-          if fpchmod(vcsa,ttystat.mode)<>0 then
-            halt(result_chmod_error);
-          writeln(vcsa);
-          exitcode:=result_success;
-        end;
-    end;
-end.

+ 1 - 14
utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/12/14]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/11/26]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@@ -879,11 +879,6 @@ GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 endif
 endif
 endif
-ifeq ($(CPU_TARGET),powerpc64)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)
-endif
-endif
 endif
 ifndef GCCLIBDIR
 CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
@@ -2336,14 +2331,6 @@ override FPCEXTCMD:=$(FPCOPT)
 override FPCOPT:=!FPCEXTCMD
 export FPCEXTCMD
 endif
-override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
-override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
-ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))
-override ACROSSCOMPILE=1
-endif
-ifdef ACROSSCOMPILE
-override FPCOPT+=$(CROSSOPT)
-endif
 override COMPILER:=$(FPC) $(FPCOPT)
 ifeq (,$(findstring -s ,$(COMPILER)))
 EXECPPAS=