Print this page
14249 pseudo-terminal nomenclature should reflect POSIX
Change-Id: Ib4a3cef899ff4c71b09cb0dc6878863c5e8357bc

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/devfsadm/misc_link.c
          +++ new/usr/src/cmd/devfsadm/misc_link.c
↓ open down ↓ 216 lines elided ↑ open up ↑
 217  217          },
 218  218          { "printer", "^printers/[0-9]+$",
 219  219              RM_PRE | RM_HOT | RM_ALWAYS, ILEVEL_0, devfsadm_rm_all
 220  220          },
 221  221          { "av", "^av/[0-9]+/(async|isoch)$",
 222  222              RM_PRE | RM_HOT | RM_ALWAYS, ILEVEL_0, devfsadm_rm_all
 223  223          },
 224  224          { "pseudo", "^daplt$",
 225  225              RM_PRE | RM_ALWAYS, ILEVEL_0, devfsadm_rm_all
 226  226          },
 227      -        { "pseudo", "^zcons/" ZONENAME_REGEXP "/(" ZCONS_MASTER_NAME "|"
 228      -                ZCONS_SLAVE_NAME ")$",
      227 +        { "pseudo", "^zcons/" ZONENAME_REGEXP "/(" ZCONS_MANAGER_NAME "|"
      228 +                ZCONS_SUBSIDIARY_NAME ")$",
 229  229              RM_PRE | RM_HOT | RM_ALWAYS, ILEVEL_0, devfsadm_rm_all
 230  230          },
 231  231          { "pseudo", "^" CPUID_SELF_NAME "$", RM_ALWAYS | RM_PRE | RM_HOT,
 232  232              ILEVEL_0, devfsadm_rm_all
 233  233          },
 234  234          { "enclosure", "^es/ses[0-9]+$", RM_POST,
 235  235                  ILEVEL_0, devfsadm_rm_all
 236  236          },
 237  237          { "pseudo", "^pfil$",
 238  238              RM_PRE | RM_ALWAYS, ILEVEL_0, devfsadm_rm_all
↓ open down ↓ 228 lines elided ↑ open up ↑
 467  467          (void) strcat(path, buf);
 468  468          free(buf);
 469  469  
 470  470          (void) devfsadm_mklink(path, node, minor, 0);
 471  471          return (DEVFSADM_CONTINUE);
 472  472  }
 473  473  
 474  474  /*
 475  475   * Handles:
 476  476   *      minor node type "ddi_printer".
 477      - *      rules of the form: type=ddi_printer;name=bpp  \M0
      477 + *      rules of the form: type=ddi_printer;name=bpp  \M0
 478  478   */
 479  479  static int
 480  480  printer_create(di_minor_t minor, di_node_t node)
 481  481  {
 482  482          char *mn;
 483  483          char path[PATH_MAX + 1], *buf;
 484  484          devfsadm_enumerate_t rules[1] = {"^printers$/^([0-9]+)$", 1, MATCH_ALL};
 485  485  
 486  486          mn = di_minor_name(minor);
 487  487  
↓ open down ↓ 181 lines elided ↑ open up ↑
 669  669          }
 670  670  
 671  671          (void) snprintf(path, sizeof (path), "zcons/%s/%s", zonename,
 672  672              minor_str);
 673  673          (void) devfsadm_mklink(path, node, minor, 0);
 674  674  
 675  675          return (DEVFSADM_CONTINUE);
 676  676  }
 677  677  
 678  678  /*
 679      - *      /dev/cpu/self/cpuid     ->      /devices/pseudo/cpuid@0:self
      679 + *      /dev/cpu/self/cpuid     ->      /devices/pseudo/cpuid@0:self
 680  680   */
 681  681  static int
 682  682  cpuid(di_minor_t minor, di_node_t node)
 683  683  {
 684  684          (void) devfsadm_mklink(CPUID_SELF_NAME, node, minor, 0);
 685  685          return (DEVFSADM_CONTINUE);
 686  686  }
 687  687  
 688  688  /*
 689  689   * For device
↓ open down ↓ 28 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX