src/java.desktop/unix/classes/sun/print/UnixPrintService.java

rev 59383 : [mq]: final

*** 1,7 ****
  /*
!  * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 220,254 ****
              name = new PrinterName(printer, null);
          }
          return name;
      }
  
-     private PrinterIsAcceptingJobs getPrinterIsAcceptingJobsSysV() {
-         String command = "/usr/bin/lpstat -a " + printer;
-         String[] results= PrintServiceLookupProvider.execCmd(command);
- 
-         if (results != null && results.length > 0) {
-             if (results[0].startsWith(printer + " accepting requests")) {
-                 return PrinterIsAcceptingJobs.ACCEPTING_JOBS;
-             }
-             else if (results[0].startsWith(printer)) {
-                 /* As well as "myprinter accepting requests", look for
-                  * "myprinter@somehost accepting requests".
-                  */
-                 int index = printer.length();
-                 String str = results[0];
-                 if (str.length() > index &&
-                     str.charAt(index) == '@' &&
-                     str.indexOf(" accepting requests", index) > 0 &&
-                     str.indexOf(" not accepting requests", index) == -1) {
-                    return PrinterIsAcceptingJobs.ACCEPTING_JOBS;
-                 }
-             }
-         }
-         return PrinterIsAcceptingJobs.NOT_ACCEPTING_JOBS ;
-     }
- 
      private PrinterIsAcceptingJobs getPrinterIsAcceptingJobsBSD() {
          if (PrintServiceLookupProvider.cmdIndex ==
              PrintServiceLookupProvider.UNINITIALIZED) {
  
              PrintServiceLookupProvider.cmdIndex =
--- 220,229 ----
*** 322,334 ****
          return PrinterIsAcceptingJobs.NOT_ACCEPTING_JOBS;
  
      }
  
      private PrinterIsAcceptingJobs getPrinterIsAcceptingJobs() {
!         if (PrintServiceLookupProvider.isSysV()) {
!             return getPrinterIsAcceptingJobsSysV();
!         } else if (PrintServiceLookupProvider.isBSD()) {
              return getPrinterIsAcceptingJobsBSD();
          } else if (PrintServiceLookupProvider.isAIX()) {
              return getPrinterIsAcceptingJobsAIX();
          } else {
              return PrinterIsAcceptingJobs.ACCEPTING_JOBS;
--- 297,307 ----
          return PrinterIsAcceptingJobs.NOT_ACCEPTING_JOBS;
  
      }
  
      private PrinterIsAcceptingJobs getPrinterIsAcceptingJobs() {
!         if (PrintServiceLookupProvider.isBSD()) {
              return getPrinterIsAcceptingJobsBSD();
          } else if (PrintServiceLookupProvider.isAIX()) {
              return getPrinterIsAcceptingJobsAIX();
          } else {
              return PrinterIsAcceptingJobs.ACCEPTING_JOBS;
*** 351,368 ****
          } else {
              return null;
          }
      }
  
-     private QueuedJobCount getQueuedJobCountSysV() {
-         String command = "/usr/bin/lpstat -R " + printer;
-         String[] results= PrintServiceLookupProvider.execCmd(command);
-         int qlen = (results == null) ? 0 : results.length;
- 
-         return new QueuedJobCount(qlen);
-     }
- 
      private QueuedJobCount getQueuedJobCountBSD() {
          if (PrintServiceLookupProvider.cmdIndex ==
              PrintServiceLookupProvider.UNINITIALIZED) {
  
              PrintServiceLookupProvider.cmdIndex =
--- 324,333 ----
*** 415,442 ****
          }
          return new QueuedJobCount(qlen);
      }
  
      private QueuedJobCount getQueuedJobCount() {
!         if (PrintServiceLookupProvider.isSysV()) {
!             return getQueuedJobCountSysV();
!         } else if (PrintServiceLookupProvider.isBSD()) {
              return getQueuedJobCountBSD();
          } else if (PrintServiceLookupProvider.isAIX()) {
              return getQueuedJobCountAIX();
          } else {
              return new QueuedJobCount(0);
          }
      }
  
-     private PrintServiceAttributeSet getSysVServiceAttributes() {
-         PrintServiceAttributeSet attrs = new HashPrintServiceAttributeSet();
-         attrs.add(getQueuedJobCountSysV());
-         attrs.add(getPrinterIsAcceptingJobsSysV());
-         return attrs;
-     }
- 
      private PrintServiceAttributeSet getBSDServiceAttributes() {
          PrintServiceAttributeSet attrs = new HashPrintServiceAttributeSet();
          attrs.add(getQueuedJobCountBSD());
          attrs.add(getPrinterIsAcceptingJobsBSD());
          return attrs;
--- 380,398 ----
          }
          return new QueuedJobCount(qlen);
      }
  
      private QueuedJobCount getQueuedJobCount() {
!         if (PrintServiceLookupProvider.isBSD()) {
              return getQueuedJobCountBSD();
          } else if (PrintServiceLookupProvider.isAIX()) {
              return getQueuedJobCountAIX();
          } else {
              return new QueuedJobCount(0);
          }
      }
  
      private PrintServiceAttributeSet getBSDServiceAttributes() {
          PrintServiceAttributeSet attrs = new HashPrintServiceAttributeSet();
          attrs.add(getQueuedJobCountBSD());
          attrs.add(getPrinterIsAcceptingJobsBSD());
          return attrs;
*** 470,482 ****
        }
          return new UnixPrintJob(this);
      }
  
      private PrintServiceAttributeSet getDynamicAttributes() {
!         if (PrintServiceLookupProvider.isSysV()) {
!             return getSysVServiceAttributes();
!         } else if (PrintServiceLookupProvider.isAIX()) {
              return getAIXServiceAttributes();
          } else {
              return getBSDServiceAttributes();
          }
      }
--- 426,436 ----
        }
          return new UnixPrintJob(this);
      }
  
      private PrintServiceAttributeSet getDynamicAttributes() {
!         if (PrintServiceLookupProvider.isAIX()) {
              return getAIXServiceAttributes();
          } else {
              return getBSDServiceAttributes();
          }
      }